Reinstate Sphinx search, remove Elasticsearch customisations
Merge branch 'reinstate-sphinx-search' into hampshire