Allow config files to override default config values
Merge pull request #192 from gilles-leblanc/override_defaults

Allow config files to override default config values