Add the city searching
City stuff
Merge
Move into panel
Merge branch 'master' of https://github.com/claytongulick/kicktravel