Celery fix
Merge pull request #46 from mistercrunch/celery_fix

Celery execution fixes