phpmyadmin
phpmyadmin fixed.
Merge branch 'master' of ssh://github.com/jjg1914/puppet

Conflicts:
	modules/php/manifests/init.pp