Update gitconfig
Merge branch 'master' of github.com:tombamford/puppet