Update es query

Use a proper elasticsearch query that utilizes bitsets and caching correctly [1].  There is a significant improvement in query performance with this PR.

This PR includes #2.

[1] http://www.elasticsearch.org/blog/all-about-elasticsearch-filter-bitsets/