renamed the travis file to the correct one
Merge branch 'master' of github.com:shizazzle/codejam