Added DB stuff to php setup for webbox
Merge branch 'master' of github.com:kd0kfo/vagrantfiles

Conflicts:
	puppetbased/manifests/site.pp