Merge pull request #29 from hashworks/feature/mergeconfigfiles

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