Misc zshrc stuff, aliases, etc.
Merge remote-tracking branch 'origin/master'

Conflicts:
	link/.zshrc