A load of composer fixes
Merge pull request #33 from GrahamCampbell/composer

A load of composer fixes