We need a smarter configuration merging mechanism that does the following: - does not cause issue #17 - separates the remote configuration from the local one - merges the remote configuration on the local one by default (with the optional possibility to overwrite instead of merging) - removes configuration that were added but then later removed