Merge branch 'master' of dev-environments/vagrant-laravel4
Merge branch 'master' of dev-environments/vagrant-laravel4