More tests for configuration merge/overwrite, one failing
Docs update
Reverse merge order, fixes #98
Changelog!