fix(travis): fixes from the third_party.go merge
Merge pull request #475 from philips/fixup-travis

fix(travis): fixes from the third_party.go merge