Added syntax hl to zsh, and sorted + updated gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore_global