upgrade to buildout 2