Adds .gitconfig
Moved .gitconfig to git/
Fixed up some paths in ediff