More vim fixes and zshrc entry for nvm.