Upstream updates

Work in progress.

Pull in latest code from ohana-web-search while preserving SMC customizations.

**Things to check**:

- CSS styling for farmers' markets term pop-ups on details page.

- Check if term-popup-manager.js needs JS style or syntax updates.

**Things to add**:

- Tests for Service Area and Kind filters.

- service_area checkbox

- kind checkboxes

- Styling for Service Area filter.

- Styling for Kind checkboxes.

**Things to fix**:

- The different map markers that correspond to the "Kind" field are no longer showing up on the map

- Update Modernizr code in _head.html.haml to reflect the fact that the Kind search filter should be a collection of checkboxes, not radio buttons because you can search on multiple Kinds at once.

**Note**:

- Make sure your `application.yml` is up to date. I suggest copying and pasting from `application.example.yml`.

- Assets have been precompiled locally to speed up deployment to Heroku. If you will be making changes to anything in the asset pipeline, please run `RAILS_ENV=production rake assets:precompile`