city now has gathering place

cleaned up templates, fixed cityname data, etc.