Upgrade to ElasticSearch 1.2.1 - untested

I'm having difficulty running the tests on current master, so you may want to test this change before merging since I was unable to