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

fix travis builds for 2.0, 2.1
env fix for 1.9 on travis-ci
Merge branch 'master' into 652_tag_improvements