Update .travis.yml
fix travis conf
Merge pull request #6 from macwadu/integration

Integration