Bundle new version of setuptools (nee distribute)

Fixes #87.
Update changelog.
Merge 0.4.6 changes into dev