vimrc: go back to magic, use gdefault, other changes
Update bundles