vimrc: remove some things, reorder some things