Travis and composer improvements
Merge pull request #21 from GrahamCampbell/travis

Travis And Composer Improvements
Merge remote-tracking branch 'upstream/master'