Allow multiple categories on search
fix tests to use promise-based searches
Add commentary about search changes
Merge branch 'master' of https://github.com/wakati/benefisher

Conflicts:
	public/javascripts/controllers/search-controller.js