Ignoring those nasty .orig files generated by diffmerge.
Adding the nerdtree-execute VIM plugin.
Removed alloy's MacVim fork. It's too buggy.