Removed extern references to global city

Remove all extern references to a global City variable. It's still not pretty, but it's step 1 to cleaning up and encapsulating objects.