Some refactoring and updated docs
Fix typo
Some minor changes
Merge pull request #33 from buger/elasticsearch_refactoring

ElasticSearch refactoring and updated docs