Updates to image management, settings.py.dist, other places
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere