Add current node version to the prompt when in a nave subshell
Add addp alias
Fix merge conflicts