cleanup
fpath fix
Merge branch 'master' of github.com:gjvc/etc

Conflicts:
	pkg/zsh/functions/default