Add travis ci
Merge branch 'travis'