Clean up vimrc some more