modify travis ci
Merge branch 'jimmy'