[zsh/zshrc] Update makefile to handle move to zsh directory properly.
[zsh/zshrc] Use macvim when installed, in place of vim.