Adding alias for p4 to use vimdiff
Merge branch 'master' of ssh://github.com/dustinswan/dotfiles