refactoring

Signed-off-by: David Guillemin <david.guillemin@gmail.com>
Merge branch 'dev' of github.com:flash-square/vagrant-lamp

Signed-off-by: David Guillemin <david.guillemin@gmail.com>

Conflicts:
	puppet/modules/srvr/manifests/mod_apache.pp
	puppet/modules/srvr/manifests/mod_php.pp