Update to use zc.buildout 2.2.x and the new setuptools