Merge branch 'master' of https://github.com/codelucas/oh-my-zsh

Conflicts:
	templates/zshrc.zsh-template
Merge branch 'master' of https://github.com/codelucas/oh-my-zsh