Clean up vimrc somewhat