.
.
Merge branch 'master' of github.com:joetjen/vagrant-base
Added mysql, apache2 and php5 to vagrant-base