Allow user to choose to merge default configs

As per issue #263, re-implement a way to let user choose to merge their
config with the default file.
https://github.com/simogeo/Filemanager/pull/263#discussion-diff-14722699