Updated gitconfig
More awesome git aliases
Merge branch 'master' of https://github.com/ushu/dotfiles

Conflicts:
	.gitconfig