Merge pull request #186 from bastiaanb/feature/config-files-can-override-2

if a config file has .override appended to its name, it will override…