Moved my `ls` alias to .zshrc as I'd like it to be with me in every
environment.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.zprofile
	.zshrc