vimrc: major reorg