catch up the latest official version z
use the old notdir function for better performance

let's wait for fish to add some basic string manipulation functions
Fix this script to properly use emitted PWD event instead of hacking fish_prompt (which was no longer working)
Merge branch 'master' of github.com:danielb2/z-fish

Conflicts:
	z.fish