Fixes cross-matching of city/states

- Introduced with 817a55ee1dcf5e95f25358df192f46662e2a10c3 because of this issue: https://groups.google.com/forum/?fromgroups#!topic/elasticsearch/hKts0hO8NCQ
- Upgraded gems