Upgrade to buildout-2