Added travis support
Merge branch 'travis'