macvim as diff and merge tool
better global gitignore
Add backup, improve symlinks.