These changes were uncommited, but necessary for running production between gunnr-beta and gunnr
Fixed merge conflicts between stable(gunnr-beta) and gunnr
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Added flower to atmo-prod, available only to core-services
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Changes Steve made for production.
	modified:   service/tasks/allocation.py
Merge remote-tracking branch 'origin/gunnr' into stable
Changed dist/conf files to allow flower authentication