Merge to add .travis.yml file