Various 'ls' alias changes

There's no need to always use '-l', too much information.
Merge branch 'master' of github.com:Pyrohh/dotfiles

Conflicts:
	zsh/aliases.zsh