Updated Vagrantfile template.
Merged Vagrantfile updates.