Merge pull request #12 from PunchRockgroin/master

Update composer.json for Laravel 4.2