Revert "Replaced distribute_setup.py with the latest from http://python-distribute.org/distribute_setup.py."

This reverts commit bc08bc18747974c830e474085839aa182d788c62.
Instead of just lowering the version number, we should just revert to
the old file (contents).
Merge remote-tracking branch 'upstream/master'
Fixed typos in CHANGELOG.