This hack didn't work on filenames with spaces, and I don't need it anymore.
p4-vimdiff needs bash
Merge branch 'master' of github.com:jleen-sfdc/dotfiles