fix git email.
Merge branch 'master' of github.com:jmesmon/dotfiles

Conflicts:
	.config
	_.hgrc
update vundle.