Revert all previous commit related to the upgrade to zc.buildout 2.2.1. Travis CI does not support setuptools>=0.7, therefore we can not use zc.buildout 2.2.1.