Edit .gitconfig
Merge branch 'master' of github.com:etdev/dotfiles