update travis config
Merge branch 'develop'

* develop:
  update travis config