Merge pull request #198 from ngds/map_search

Map Search Refactor
css bug
working out merge conflicts
Merge branch 'master' into map_search
updating to leaflet 0.8