Changes made yml file
Merge BenB changes
Local server yml file update
Merge branch 'master' of github.com:icemancast/vagrant-lamp