Added a bunch of new cities.
Cleaned up names, emails and subdomains. Added more cities.
Merge remote-tracking branch 'upstream/master' into tweaks