Add aliases for git commands
Include sensible .zshrc defaults
Merge branch 'master' of https://github.com/colinthompson/oh-my-zsh

Conflicts:
	custom/aliases.zsh