Untab gitconfig.
Add sourcetree as a diff/mergetool.
Move floating vim files to new repository, update vundle config.