Fixed travis.
Merge pull request #40 from Cal-CS-61A-Staff/fix_travis

Fixed travis.
Merge branch 'master' into submit-model