Fix config
Merge branch 'master' into last3status

Conflicts:
	conf/application.conf
Show who toggled build