Merge changes from work.

- Only cd once (avoid cd on re-sourcing shrc).
- Source ~/.shrc.local
- short_hostname that works at home and at work
- Unset KSH_AUTOLOAD so that bashcompinit works in zsh
- Add a few aliases including phup and stage
- Add auth_info to the prompt
- Use meld as git merge guitool