Upgrade to Elasticsearch 1.3.4
Merge branch 'elasticsearch-1.3.4'