Upgrade bootstrap
Cleanup buildout