Adding in the search mapper.
Merge branch 'master' of github.com:opencivicdata/locust