Update Travis configuration
Merge branch 'travis'