Aliases, mail address etc
Merge branch 'master' of github.com:trondbert/gitconfig

Conflicts:
	.gitconfig