Merge branch 'puppet_fixes'
Merge branch 'vagrant_config'