Merge pull request #70 from Spomky/master

Structural changes
Changed the travis config to use the builtin composer