Continued work on Vagrant and Puppet