Merge branch 'origin/zsh-syntax-highlighting'

Conflicts:
	.gitmodules
	zshrc