Adds Travis config file
Merge branch 'master' into diff