Update to Elasticsearch 0.20.2 and mapper 1.6 Fix #6