add travis.yml
update .travis.yml
Merge branch 'travis'