removed logstash 1.3 deprecated params, minor formatting cleanup