master: Updates to the Cheffile, VagrantFile and some resources.