Eric fix branch

Updated a crap ton of content on the city pages