update travis config.
Merge branch 'dev'