Merge branch 'dev' of github.com:flash-square/vagrant-lamp

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

Conflicts:
	puppet/manifests/init.pp
Merge branch 'dev' of github.com:flash-square/vagrant-lamp