Small bugfixes found and fixed.
Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into herja
Updated celery conf