added syntax highlighting -- still haven't removed colors! :'(
move zsh syntax highlighting dir
Merge branch 'master' of https://github.com/finbarrocallaghan/dotfiles

Conflicts:
	setup.sh