Added .gitconfig to the mix.
Added git difftool vimdiff (aliased to git d)
Added diffconflicts script that uses vimdiff smarter for git conflict
merging