Merge branch 'master' of github.com:richleland/oh-my-zsh into richleland
Merge branch 'richleland' of github.com:richleland/oh-my-zsh into richleland