fix cd completion error and remove grep/sgrep function
Merge remote-tracking branch 'origin'

* origin:
  fix cd completion error and remove grep/sgrep function