No idea why this was like this but fixing (back to how it was I think)
Merge branch 'master' of https://github.com/partnermarketing/puppet-php into HEAD

Conflicts:
	manifests/params.pp