Merge both config files to avoid missing settings after an upgrade
Merge remote-tracking branch 'upstream/master' into feature/mergeconfigfiles

Conflicts:
	config.dist.php
Fix example for multiple channels in config
Uncomment plugin configuration so it is't used when nothing is configurated in config.php
Merge remote-tracking branch 'upstream/master' into feature/mergeconfigfiles

Conflicts:
	VikingBot.php
Merge remote-tracking branch 'upstream/master' into feature/mergeconfigfiles

Conflicts:
	README
Merge pull request #29 from hashworks/feature/mergeconfigfiles

Merge both config files to avoid missing settings after an upgrade