fix some problems with vagrant bootstrap

Some tweaks to make the vagrant bootstrap work better.