Search and replace servername in atmosphere/settings/__init__.py
	modified:   src/atmo_setup.sh
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/crushbone