Merge branch 'develop' of https://github.com/AllenInstitute/render-python-apps into develop

Author: fcollman

setup.py

@@ -22,7 +22,7 @@ def run_tests(self):
         sys.exit(errno)
 
 
-with open('integration_tests/requirements.txt', 'r') as f:
+with open('test_requirements.txt', 'r') as f:
     test_required = f.read().splitlines()
 
 with open('requirements.txt', 'r') as f: