Added diff wrapper, separate vimrc.