merging in changes just pushed to github.com/jdamick/kafka.go