Adding the .travis.yml file
Merge branch 'master' into develop