.gitconfig update
Merge branch 'master' of https://github.com/miwurster/conf