PEP8 + Core (Part 1)
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere