added default hosts config
Tweaked merge a bit. Cleaned up messy code.
Updated TODO list