Upgrade to elasticsearch 1.1