Elasticsearch

base for discussion and code review. it is very hard to split up in multiple commits. should i make commits like 'elasticsearch test helper'?