Merge pull request #33 from simonpasquier/split-elasticsearch-plugin

Split the Elasticsearch plugin