update

Conflicts:
	home/brewfile
bundle update (delete gs so that libpng does not conflict)
to use z, bd, grep
update on Linux HEP_DIR
display server ID in prompt
root-config as optional
move HOSTNAME to RPROMPT
Merge branch 'master' into emacs_initloader
z.sh adopt to no_unset
SSH/X from IPMU-Win to IPMU-Dev
Merge branch 'master' into emacs_initloader