Simplify logic slightly

.present? and .blank? are the inverse of each other, so the logic is identical.
Refactor the passing of search results to the view

This removes some duplication, and should make it easier to implement
experimental tabs with merged indices.
Merge remote-tracking branch 'origin/refactor_search_controller'