Add travis configuration
Merge branch 'travis'