Some more comments in the Scala helpers
Elasticsearch version upgrade

 - Upgrading to elasticsearch 0.20.4
 - Upgrading module version to 0.5.1
Merge branch 'master' into scala