Moved to logstash 1.4.2/kibana 3.0.1/elasticsearch 1.1.1
Fixed logstash conf
Merge branch 'master' into features/map-infobox