Trunked version of current gitconfig
Merge branch 'master' of github.com:cybic/git-stuff