Merge branch 'search'

* search:
  Adding six requirement.
  Forcing all terms to be found.
  Cribbing mapping from haystack.
  Swapping out haystack for pyes.
Changing param names.
Fixing two bugs: dont clear mapping/index when re-indexing at offset. Pull on pip upgrades.
Merge branch 'master' into search

* master:
  Fixing two bugs: dont clear mapping/index when re-indexing at offset. Pull on pip upgrades.
Rewriting search to use Elasticsearch across feeds. Much faster, just needs indexing.