fixed cdpath
Merge branch 'master' into bender

* master:
  fixed cdpath

Conflicts:
	zshrc