upgrade email in gitconfig
Merge branch 'master' of https://github.com/jkischkel/dotfiles