Merge branch 'stibbons_fix_git_aliases'

Conflicts:
	plugins/git/git.plugin.zsh