travis: fix up the diff grepper
Merge branch 'travis'