Changed atmo.conf.dist for to be used in conjuction with the continous integration deployment script
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere