Clean up vimrc a little