Everything has broken since this last ran. This commit fixes a few obvious things but the whole Vagrant thing needs some attention.