Append, rather than prepend to PROMPT_COMMAND
Handle empty PROMPT_COMMANDS
Merge branch 'master' into prompt_command_append

Conflicts:
	z.sh