Travis config
Merge branch 'master' into gajdaw
Removed .travis file