Updated to work with zc.buildout >= 2