Split out common imaging functions, added a new setting for local image storage. Change your .dist
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere