fixes
Merge branch 'master' of github.com:rtconner/laravel-plusplus