Addressing Jira tickets.
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere