Update git config
Merge branch 'master' of github:shaoner/xconfig