Updated atmo_setup
Moved logic around for when to restart celery/atmosphere, allow more flexibility for running jenkins