upated travis config file
Merge branch 'travis'