Revert "Revert "upgrade to elasticsearch/elasticsearch 0.9.6""