Merge branch 'master' of github.com:frigg/frigg-worker into issue99-support-yaml-ending

Conflicts:
	setup.py