nvm to bashrc

I think bash_profile is actually the right place for this, but it seems
to handle being re-invoked in a non-login shell, and this works around
microsoft/vscode-remote-release#1671

bash_profile

@@ -73,11 +73,6 @@ then
 	export PATH=$PATH:"/Applications/Visual Studio Code.app/Contents/Resources/app/bin"
 fi
 
-# nvm
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
-
 export XTERMCMD=uxterm
 export AFSHOME=/afs/andrew/usr/jwatzman
 export EDITOR=vim

bashrc

@@ -60,6 +60,11 @@ if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
 fi
 
+# nvm
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
 # enable color support of ls and also add handy aliases
 if [ -x /usr/bin/dircolors ]; then
     eval "`dircolors -b`"