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

Conflicts:
	lib/correction.zsh
	plugins/git/git.plugin.zsh
	plugins/rvm/rvm.plugin.zsh