zsh changes
Merge branch 'master' of github.com:djoshea/dotFiles