Improve option descriptions a bit
Disable the logstash test

It's broken because it uses the "grep" plugin, which is no longer
included in the standard distribution.