Muni on by default
Fix some issues with db-site cluster merging (now doing rails-side) and add new cluster icons