Update .travis.yml to build upstream in appropriate directory
Merge branch 'make' of github.com:pantheon-learning/10s2cl into make