Customizing cookbook.
Merge branch 'master' of https://github.com/SebastianEdwards/oh-my-zsh-chef

Conflicts:
	templates/default/zshrc.erb