Updated composer and .travis buildfile
Merge branch 'travis'