path completion
Merge branch 'master' into bender

* master:
  path completion

Conflicts:
	zshrc