vimrc cleanup (again)