fix the New York address search. Also included a small change in Canada and the US which removes the 'City of' in front of city names when it's there. Nobody uses the official 'City of' form of city names so it doesn't make sense to have it in the default style.
-Ben Konrath


git-svn-id: http://svn.mkgmap.org.uk/mkgmap/trunk@3338 25d90789-57f7-4ee0-8453-03a3dfeeeb22