Various fixes for searching by keyword, tag and via filters as per BIOCAT-881, BIOCAT-882, BIOCAT-883 and BIOCAT-884.
Merge branch 'search' of github.com:myGrid/biocatalogue into search

Conflicts:
	app/views/search/_search_options.html.erb
	app/views/services/index.html.erb