use n instead of nvm when available
Merge branch 'personal' of github.com:arbelt/prezto into personal

Conflicts:
	runcoms/zshrc