Allow usage with laravel 5 too
Merge pull request #182 from GrahamCampbell/patch-1

Allow usage with laravel 5 too
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	composer.json
Merge pull request #183 from GrahamCampbell/merge

Merge Master Changes Into Develop