Cleaning up vimrc a bit