Updated bootstrap/buildout