Merge branch 'develop' into celery_preset
Merge branch 'celery_preset' of github.com:eHealthAfrica/formhub into celery_preset
correct amqp url