Revert to tpope master branch (no :Gtdiff)