Update to elasticsearch v1.0.0.RC2
.travis.yml conflict merged