Per-domain configuration should override base configuration
For good measure, config.json should be loaded before per-domain config, and it should override base as well.
Merge pull request #652 from mapkyca/correct-overrides

Per-domain configuration should override base configuration