Updating to zc.buildout 2.0 and fixing tests accordingly

Recently. buildout has upgraded to a non backward compatible update. This commit updates the bootstrap script to accomodate 2.0 and fixes the tests accordingly.