Edit README to reflect previous commit's changes
Merge branch 'master' of https://github.com/codelucas/oh-my-zsh

Conflicts:
	README.textile