Add and change a few git aliases
Merge branch 'master' into linux
Add and change a few git aliases
Merge branch 'master' into linux

Conflicts:
	git/.gitconfig