File updated to reflect name change in travis-basic
Merge branch 'github-branch'