Clean up difforig function.

Instead of banking on more plugins I just ensured that the
internal vimdiff command works correctly for usage with git.
Remove MacVim and GUI Vim installs. Use iTerm.
Clean up, :diffoff needs to be lowercase. Whoops.