Update to buildout 2.2's bootstrap.
Merge master