Re-scrub Vagrant defaults

Change-Id: I012098de4e4f49b30ddb9be8869da79e12e084b5