Compact version with changed pwd, thx to mszpak

Conflicts:
	gitprompt.fish
fix problem with time field