Fix Travis bugs with client
Merge branch 'travis-fix' of https://github.com/Cal-CS-61A-Staff/ok into travis-fix

Conflicts:
	.travis.yml