Update Water Everywhere

New City getting its shit together made a big impact.
Reconcile edges and name two cities.