Update vagrant config files
merge