Improved embedded Elasticsearch (but it's still a hack)