..

Signed-off-by: flash-square <david.guillemin@gmail.com>
Merge branch 'master' of github.com:flash-square/DW-Vagrant

Signed-off-by: flash-square <david.guillemin@gmail.com>

Conflicts:
	php_dev_box/Vagrantfile
	php_dev_box/puppets/manifests/init.pp
	php_dev_box/puppets/modules/misc/manifests/init.pp