merge conflicts fixed

setup.py

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 from setuptools import setup, find_packages
-from pip.req import parse_requirements
 import re, ast
 
+with open('requirements.txt') as f:
+	install_requires = f.read().strip().split('\n')
+
 # get version from __version__ variable in foundation/__init__.py
 _version_re = re.compile(r'__version__\s+=\s+(.*)')
 
@@ -10,8 +12,6 @@ with open('foundation/__init__.py', 'rb') as f:
     version = str(ast.literal_eval(_version_re.search(
         f.read().decode('utf-8')).group(1)))
 
-requirements = parse_requirements("requirements.txt", session="")
-
 setup(
 	name='foundation',
 	version=version,
@@ -21,6 +21,5 @@ setup(
 	packages=find_packages(),
 	zip_safe=False,
 	include_package_data=True,
-	install_requires=[str(ir.req) for ir in requirements],
-	dependency_links=[str(ir._link) for ir in requirements if ir._link]
+	install_requires=install_requires,
 )