Upgrade buildout (to 2.0) and virtualenv