Small fixes to imaging and the initialization scripts while chasing a bug that was in openstack
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere