Adding travis
Merge branch 'travis'