Number of service search results is now divisible by 3 so as to have a nice results grid of 3 columns.
Fixed search function to consider scopes when caching
Removed the collapsable box that housed the search options. Just static blue box now
Added back in the form for searching over filtered service results.
Moved search options into a style consistent with service index and added 'filter these services' button
Only offer to filter by services if on service tab
Number of service search results is now divisible by 3 so as to have a nice results grid of 3 columns - added the missing file.
Merge branch 'search' of github.com:myGrid/biocatalogue into search
[BIOCAT-882] Pass any existing parameters from the search result to the filters page
Preserve existing parameters when switching view type in service index.
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
Fix for BIOCAT-885L tag cloud is now always show on the services/index page.
Preserve existing filter parameters when changing results per_page count
Reassigned importance of fields in search.

Names = 6.0
URLs = 4.0
Descriptions = 3.0
Everything else = 1.0
In search, hide the 'include archived?' option for anything other than Services, Rest Methods, and Soap Operations
Merge branch 'search'