Fully integrate composer
Merge pull request #41 from lenton/3.4/feature/composer

Fully integrate composer