Quieten pushd/popd in devvm.sh
Squashed 'htdocs/protected/yii/' content from commit e5b8ae6

git-subtree-dir: htdocs/protected/yii
git-subtree-split: e5b8ae670d2acce7121e55ea45d04cd1209aa352
Merge commit 'd78d69dfdcfe915eb318ddffd187827d8141c9be' as 'htdocs/protected/yii'
Fix permissions issues on shared folder
Minor fix to the yii structure to enable it to load in this configuration
Remove log from git and ignore it. it's automatically created anyway.
Squashed 'deployment/' changes from d57b5e4..6376ef0

6376ef0 Fix permissions issues on shared folder
0b01eb2 Fixed wrong dependency in puppet
874e181 Fixed wrong dependency in puppet
88339c0 Oops, memory was being read from the cpus env var
8a4134c Pull the index.html apache will add by default
efbd9a6 Change spacing of env vars

git-subtree-dir: deployment
git-subtree-split: 6376ef045b5cbfa36f42f3530755cc99a74e5d22
Merge commit '77fac02396599e3cec1a1905c0b005ae2518d008' into vagrantise
.htaccess from Yii
Simplified. User can now provide a manifest file through ENV vars
Merge commit '05d974ed8344ddecebe4a3e9ffbb7767b54c3ab7' into vagrantise
Make two mounts so a subdirectory of the repo can be served into /var/www
Merge commit 'a67688769970506f27bc9ce5bb21d5fcad70208c' into vagrantise
Updated devvm.sh script to work with the updated php-deployment repository. Note that the database details in the config file had to be updated