Preparing for pull
Commiting files that would be overwritte on merge
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere