moved .zshrc-aliases to .zshrc.local since we add so many other things besides aliases
merging from upstream