Complicated upgrade to Laravel 4.1