Migrating to es 0.90.6: Fixed compilation, tests still broken.

Upgrading elastic search breaks this code. I have fixed up the
compilation issues, but not fixed up the unit tests. Thus this is
step 1 in migrating to elastic search 0.90.6