Upstream updates

Merges updates from http://github.com/codeforamerica/ohana-web-search.
Included in this are Major revisions that:
- Update to Rails 4
- Incorporate UI changes:

BEFORE:
![screen shot 2014-05-30 at 1 06 25 pm](https://cloud.githubusercontent.com/assets/704760/3135626/452f0780-e836-11e3-86a8-34b7e1d62e00.png)
![screen shot 2014-05-30 at 1 06 38 pm](https://cloud.githubusercontent.com/assets/704760/3135628/452fb07c-e836-11e3-9cc7-326e9428cae7.png)
![screen shot 2014-05-30 at 1 06 51 pm](https://cloud.githubusercontent.com/assets/704760/3135627/452fab4a-e836-11e3-9482-f05ec75b68aa.png)
![screen shot 2014-05-30 at 1 07 10 pm](https://cloud.githubusercontent.com/assets/704760/3135629/45312704-e836-11e3-93a2-a0b3da7be2a5.png)

AFTER:
![screen shot 2014-05-30 at 1 08 11 pm](https://cloud.githubusercontent.com/assets/704760/3135634/4f5b9ae8-e836-11e3-8550-1978df9a55dd.png)
![screen shot 2014-05-30 at 1 08 35 pm](https://cloud.githubusercontent.com/assets/704760/3135632/4f54a206-e836-11e3-928f-cf11fd856dfd.png)
![screen shot 2014-05-30 at 1 08 46 pm](https://cloud.githubusercontent.com/assets/704760/3135631/4f534f00-e836-11e3-8719-ef68bc5d0d36.png)
![screen shot 2014-05-30 at 1 08 01 pm](https://cloud.githubusercontent.com/assets/704760/3135633/4f56f434-e836-11e3-84a4-e7af0ff5e70a.png)