Merge commit 'a729e8'

Brings us up to date with upstream master as of May.

AUTHORS.md

@@ -4,10 +4,21 @@ Ordered by contribution
 
 * David Arthur, [@mumrah](https://github.com/mumrah)
 * Mahendra M, [@mahendra](https://github.com/mahendra)
+* Omar, [@rdiomar](https://github.com/rdiomar) - RIP, Omar. 2014
+* Marc Labbé, [@mrtheb](https://github.com/mrtheb)
 * Ivan Pouzyrevsky, [@sandello](https://github.com/sandello)
+* Thomas Dimson, [@cosbynator](https://github.com/cosbynator)
 * Jim Lim, [@jimjh](https://github.com/jimjh)
+* Zack Dever, [@zever](https://github.com/zever)
 * StevenLeRoux, [@StevenLeRoux](https://github.com/StevenLeRoux)
+* Saulius Žemaitaitis, [frgtn](https://github.com/frgtn)
+* Vadim Graboys, [@vadimg](https://github.com/vadimg)
+* Joe Crobak, [@jcrobak](https://github.com/jcrobak)
+* Niek Sanders, [@nieksand](https://github.com/nieksand)
+* Greg Bowyer, [@GregBowyer](https://github.com/GregBowyer)
+* Evan Klitzke, [@eklitzke](https://github.com/eklitzke)
 * [@anentropic](https://github.com/anentropic)
+* Stephen Armstrong, [@stephenarmstrong](https://github.com/stephenarmstrong)
 * Ben Frederickson, [@benfred](https://github.com/benfred)
 
 Thanks, everyone!

setup.py

@@ -22,7 +22,6 @@ def run(self):
     name="kafka-quixey",
     version="0.9.0-q2",
 
-    install_requires=["distribute"],
     tests_require=["tox", "mock"],
     cmdclass={"test": Tox},