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.

I was trying to do a separate change but was unable to because the existing bootstrap script breaks due to the new buildout :) This fixes that.