heroku tweaks
undo stupid heroku tweak
fixed city_id