update gitconfig
Merge branch 'master' of https://github.com/erks/bootstrap