Update to settings.py.dist
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere