Made a few more tweaks to vimrc.