Move .gitconfig to make it inline with XDG
Merge branch 'master' into netbook