Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere
Merge branch 'atmo-295'
Merge branch 'atmo-291'
Merge branch 'atmo-291'
Merge branch 'atmo-299'
Merge branch 'atmo-299'
Shutoff instances now count toward quota
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into gunnr
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into gunnr