Began cleanup of .vimrc