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

Conflicts:
	setup.py
Merge remote-tracking branch 'origin/issue99-support-yaml-ending'

Conflicts:
	setup.py