Merging in some consumer fixes

Merging this in https://github.com/mumrah/kafka-python/pull/136