Update gitconfig with new aliases & config changes
Merge branch 'master' of github.com:royaldark/dotfiles

Conflicts:
	.gitconfig