update travis conf
Merge branch 'hotfix/addtravis'