Fix typo
Merge branch 'master' of github.com:frigg/frigg-worker

Conflicts:
	setup.py