Merge.
Add some php options.
Conflicts:
	Vagrantfile
	puppet/vagrant-manifests/web.pp