Fix bootstrap

Tidy up a couple of issues in the vagrant bootstrap script.