ing. Add pip-tools.
	modified:   requirements.txt
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Modify to work with crushbone
Merge branch 'bald-eagle'
api.email now uses web.emails to send email, rather than one-off code
Merge branch 'bald-eagle'
Initial commit and use-case.. Refactor imminent
Temporary commit, working on refactoring 'inputs' from Warlock to Python classes
Attempted to fix merge conflicts, added some notes
Merge branch 'bald-eagle'
Merge branch 'bald-eagle'
Merge branch 'bald-eagle'
Merge branch 'bald-eagle'
Merge branch 'bald-eagle'
Merge branch 'bald-eagle' into allocation_rework_BEagle
Merge branch 'bald-eagle'
Merge branch 'bald-eagle' into allocation_rework_BEagle
Working on re-writing the engine to use the new classes in models.py
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into bald-eagle