PEP8 + Service
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere