Added 'shortname' to the macro
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere