Workaround on GeoPoint, and changed to the right version of elasticsearch.
Merge branch 'hotfix-geopoint'
Merged with 0.4.1
Merge remote-tracking branch 'origin/master'