Reformatting to get python setup.py install and pip -U -r to work.
	modified:   requirements.txt
	modified:   setup.py
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/rtwo

Conflicts:
	requirements.txt