Elasticsearch schema fixes.

Based on the kixi.amon-schema.

Done manually for now, but more complete than before.