Merge remote-tracking branch 'upstream/develop' into

modular-consensus-rules
Resolves conflicts from module reorg in PR #102

Conflicts:
	bigchaindb/__init__.py
	bigchaindb/core.py

setup.py

@@ -15,6 +15,7 @@ tests_require = [
     'pytest',
     'pytest-cov',
     'pytest-xdist',
+    'pytest-flask',
 ]
 
 dev_require = [
@@ -26,6 +27,7 @@ docs_require = [
     'recommonmark>=0.4.0',
     'Sphinx>=1.3.5',
     'sphinxcontrib-napoleon>=0.4.4',
+    'sphinx-rtd-theme>=0.1.9',
 ]
 
 setup(
@@ -80,6 +82,8 @@ setup(
         'logstats==0.2.1',
         'base58==0.2.2',
         'bitcoin==1.1.42',
+        'flask==0.10.1',
+        'requests==2.9',
     ],
     setup_requires=['pytest-runner'],
     tests_require=tests_require,