Added zsh if conditions to check for platform specific things
Merged zshrc