Merge branch 'dev' into server

diff --cc README.rst
Simple merge

diff --cc setup.py
index 760a8aee5f4ebd49db58f5337cf6b7f2c60ed130,11140d6e5a0f215187fd597c287276670b544ac4..9699e9d01393d25515aea4a394503ef86a0dc865
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -1,7 -1,23 +1,24 @@@
  #!/usr/bin/env python
  # -*- coding: utf-8 -*-
 +
  from setuptools import setup, find_packages
+ import sys
+ from setuptools.command.test import test as TestCommand
+ 
+ # Pytest
+ class PyTest(TestCommand):
+     def finalize_options(self):
+         TestCommand.finalize_options(self)
+         self.test_args = ['tests', '--ignore', 'tests/sandbox']
+         self.test_suite = True
+ 
+     def run_tests(self):
+         #import here, cause outside the eggs aren't loaded
+         import pytest
+         errno = pytest.main(self.test_args)
+         sys.exit(errno)
+ 
+ 
  
  CLASSIFIERS = [
      'Intended Audience :: Science/Research',