host net
Merge branch 'master' of github.com:nihilifer/shmir-docker
New queue names, server concurrency setup
Supervisord for docker
flower openid
Merge branch 'master' of github.com:nihilifer/shmir-docker
Merge branch 'master' of github.com:Nozdi/shmir into stable

Conflicts:
	.gitignore
	etc/supervisord.conf
	scripts/flower