Added zsh syntax highlighting
Updates
Merge branch 'master' of https://github.com/tgsergeant/dotfiles

Conflicts:
	home/.vim/bundle/vim-ctrlp