Merge pull request #1 from justforfunfuntest/master

Update .travis.yml