Hand-transfer of PR #162. Too many changes between now and then to merge automatically.
Merge pull request #188 from 18F/feature/add-search-patch

Hand-transfer of PR #162. Too many changes between now and then to merge...