Misc improvements to vimrc.
Fixed error in vimrc.