Merge pull request #1 from marcguyer/master

Vagrant environment with puppet provisioning of apache/php.