Updated docblock.
Merge branch 'master' of github.com:aaronbieber/oh-my-zsh

Conflicts:
	themes/bbs.zsh-theme
Minor modifications.