vimrc: various updates