Custom machine icons display on New Instance screen.
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere