Upgrade to Elasticsearch 2.x#49

gquintana wants to merge 1 commit intotlrx:mastertlrx/elasticsearch-test:masterfrom

gquintana:elasticsearch-2.xgquintana/elasticsearch-test:elasticsearch-2.xCopy head branch name to clipboard