- roll back to 0.20.6; I can't get 0.90 to work with logstash's embedded
  stuff.
Merge git://github.com/logstash/logstash