Update apache2 conf distribution specific file so it defaults to a more obvious bad name.
	modified:   extras/apache/atmo.conf.dist
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere