Merge pull request #75 from Baachi/master

Fix some CS issues
Merge pull request #76 from Baachi/elastica

[WIP] Refactor ElasticaClient