More env vars for docker
Merge branch 'develop' of https://github.com/burke-software/django-sis into develop
Merge branch 'master' of https://github.com/burke-software/django-sis into develop
Added some S3 setting
Added raven dsn env var
Terrible work around for https://github.com/yourlabs/django-autocomplete-light/issues/315
Merge branch 'master' of https://github.com/burke-software/django-sis into develop
Supervisor now is running libreoffice
forget this
Added production run file
Moved prefered file format setting to constance
Moved a lot of settings variables to constance
Added settings to constance migration
Celery beat now runs with multi tenant
Added flower to fig
Migrated remaining per tenant settings to constance
Added production flower
run production needs to be executable
updating our documentation for fig (was a bit out of whack)
blarb... typo...
Merge branch 'master' of https://github.com/burke-software/django-sis into develop

Conflicts:
	ecwsp/work_study/tasks.py