Git aliases

Conflicts:
	zsh/aliases.zsh