Fixed and updated some dependencies
Merge pull request #3563 from GrahamCampbell/composer-fixes

Composer Fixes And Updates