Fix celery imports (this was only working in production because of a stray .pyc file). Review by @jerith.
Merge branch 'develop' into develop-frontend