Template & Vagrant file updates