move more crap into corehq.elastic
Merge pull request #1117 from dimagi/move-it

move more crap into corehq.elastic
merge with master