Vagrant Update and Fixes