corrected puppet files
updating to newer puppet version
Merge branch 'master' of github.com:joetjen/vagrant-base

Conflicts:
	puppet/modules/apt/manifests/init.pp