Minor adjustments. Tried to use MacVim for git diff, but it didn't work.