Simple update to buildout 2.x