worked on vagrant puppet configuration
Merge branch 'master' of github.com:rwe17/MediaMagpie

Conflicts:
	Vagrantfile
	puppet/manifests/base.pp