use private email
Merge branch 'home' of github.com:greg0ire/dotfiles into home

Conflicts:
	gitconfig