composer tweak
Merge branch 'master' of git://github.com/rtconner/laravel-tagging

Conflicts:
	composer.json