vimrc: updates, formatting