Update Travis config.
Merge branch 'travis'