Fix Travis PR diffing
Merge pull request #1116 from hamiltont/travis-fix-pr-diff

Travis: Improve diffing of merges onto master