New bootstrap for latest setuptools/buildout.
Formatting tweaks and unused imports.
Sneak out a 2.0.0 release.