created initial default city locations/values/spirtes
merged erics final sprint branch with city update