Lots of vimrc reorg.