Big changes to merge all config together rather than keeping in separate :current-host etc maps
Small change to test files to differentiate betwen different configs
Re-introducing private config (with tests) into the new 'let's merge everything together' scheme
Calling top-level config :general, rather than :public
Updating the README
Moving the large backward-compatability notice outside of the code-block