Continued work on Puppet and Vagrant
Merge origin/master