Cleanup geonames URL and remove NY filter.
Merge branch 'master' into gh-pages