Merge branch 'master' of github.com:wayneeseguin/rvm

scripts/cd

@@ -57,7 +57,10 @@ if [[ ${rvm_project_rvmrc:-1} -ne 0 ]] ; then
       current="${COMP_WORDS[COMP_CWORD]}"
       if [[ -n "$CDPATH" && ${current:0:1} != "/" ]] ; then
         index=0
-        for directory in $(printf "%s" "$CDPATH" | tr -s ':' ' ') ; do
+        # The change to IFS above means that the tr below should replace ':'
+        # with a newline rather than a space. A space would be ignored, breaking
+        # TAB completion based on CDPATH again
+        for directory in $(printf "%s" "$CDPATH" | tr -s ':' '\n') ; do
           for item in $( compgen -d "$directory/$current" ) ; do
             COMPREPLY[index++]=${item#$directory/}
           done

scripts/rvm

@@ -4,7 +4,7 @@
 # http://rvm.beginrescueend.com
 # http://github.com/wayneeseguin/rvm
 
-grep -q '^rvm ()' < <( declare -f ) # Is RVM is a shell function?
+\grep -q '^rvm ()' < <( declare -f ) # Is RVM is a shell function?
 
 if [[ $? -gt 0 || ${rvm_reload_flag:-0} -eq 1 ]] ; then