chore, update travis config
Merge branch 'bld/travis'

* bld/travis:
  chore, update travis config