Update ZSH
Merge branch 'master' of github.com:RobLoach/dotfiles

Conflicts:
	composer/composer.json
	zshrc