New requirements, Removed bad tests
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere