Merge branch 'master' of github.com:uupaa/dotfiles
update .gitconfig