Merge branch 'staging'
Merge branch 'staging'
update readme
Merge branch 'staging'
Merge branch 'staging'
Unused supervisord package

supervisor is installed but no longer used in the scripts
Merge pull request #13 from pierre-jean/master

Remove supervisor from installed packages
Explicitly expose env var
Merge branch 'staging' into 5.5

Conflicts:
	Dockerfile