Update paths.
Merge remote-tracking branch 'origin/master'

Conflicts:
	runcoms/zshenv
	runcoms/zshrc