Upgrade to elasticsearch 0.90.0
Merge remote-tracking branch 'gstarnberger/upgrade_to_0.90'