renames nvm.zsh and merges holman/master