fix travis builds
Merge pull request #655 from flapjack/fix_perftools_breakage

fix travis builds for 2.0, 2.1