Merge pull request #36 from TandasCodeup/Jaime

Jaime
Fix for upgrade to Laravel 4.1.26
Merge pull request #37 from TandasCodeup/travis

Fix for upgrade to Laravel 4.1.26
Merge branch 'master' into Jaime