Upgrade to setuptools = 0.9.8 and zc.buildout = 2.2.1-eea