Added travis-ci config file
Merge branch 'travis'