Fix grammar in error string
Merge branch 'master' into conn_refactor

Conflicts:
	example.py
Merge branch 'master' into kafka_versions

Conflicts:
	example.py
Update load_example
Merge branch 'master' into kafka_versions
Merge branch 'master' into conn_refactor
Make Kafka080Client pull from topic head.  Conditionally set auto_commit
Merge branch 'kafka_versions' into easykafka

Conflicts:
	example.py
Merge pull request #1 from wizzat/pr109

Fix py26 compatibility issue, add mock to tox
Merge pull request #109 from mrtheb/develop

TopicAndPartition fix when partition has no leader = -1
Merge pull request #134 from wizzat/conn_refactor

conn.py performance improvements, make examples work, add another example
Merge branch 'master' into easykafka

Conflicts:
	example.py