Modify git username and email
Merge branch 'master' of github.com:kadoppe/dotfiles