Upgarde to bootstrap 2, clean Vagrantfile and buildout.cfg