Forced re-merge when setting user or default configs. Fixes Dynalon/JsonConfig#11
Merge pull request #12 from areyling/master

Fix for #11