merged the config.yml change, forgot i guess
Merge branch 'master' into HEAD

Conflicts:
	config.yml