Moved merge policies to map package/config.
Lots of small and medium size changes. (Too lazy to document all here..)
Proxy exception handling.
Cleanup.