Updated to the latest 1.x zc.buildout