.travis.yml and travis related stuff
Merge branch 'master' into travis