Tidy up Vagrant and Puppet configs.