Search improvements

Search was much improved in 0.6 but there are still things to add:

- [x] Sorting search results
- [ ] Investigate Solr highlighting
- [ ] Multi-faceting
- [ ] Template tag for injecting search form

This ticket is a rewritten version of #423