couple more fixes as I go along
Merge branch 'master' of git://github.com/rtconner/laravel-plusplus