Rename zshrc to zprofile
Merge branch 'master' into osx