Merge pull request #29 from daithiocrualaoich/master

Update ElasticSearch to latest version and sort out plugins.