Add more search facets, minor UI tweaks
Merge branch 'moar-search'

Conflicts:
	app/views/layouts/_container.html.erb