zsh: latest upgrades with untracked non dirty fix
vim: reorganization of bundles