Updated to work with ES 1.4 and Kibana 4