Add zshrc/vimrc from dapimac.local
merge conflict
minor fix in zshrc.imac