Merge settings with file configuration

This makes it possible to combine settings in a configuration file with
settings from a PasteDeploy .ini-file or in-Python defaults. Settings in
the configuration file will override others.