now using cities from geonames.org
Merge branch 'maxima-survey' of https://github.com/shilad/wikibrain into maxima-survey