Use travis installed elasticsearch
Merge remote-tracking branch 'origin/master' into 1863-status-color-key