Merge pull request #118 from gosquared/set-friendly

Set friendly

nvm.sh

@@ -7,7 +7,7 @@
 
 # Auto detect the NVM_DIR
 if [ ! -d "$NVM_DIR" ]; then
-    export NVM_DIR=$(cd $(dirname ${BASH_SOURCE[0]:-$0}); pwd)
+    export NVM_DIR=$(cd $(dirname ${BASH_SOURCE[0]:-$0}) && pwd)
 fi
 
 # Expand a version using the version cache
@@ -23,7 +23,7 @@ nvm_version()
     echo "$VERSION"
 
     if [ "$VERSION" = 'N/A' ]; then
-        return 13
+        return
     fi
 }