More city page stuff. now depending on local underscore
Merge branch 'master' of https://github.com/tliu91/PhotoFlow-server