Add Travis config
Merge branch 'travis'