Minor alias adjustments
ls uses -G for color in OS X

Conflicts:
	zsh/aliases.zsh