Merge remote branches 'ponder' and 'crybaby'

* ponder:
  el/dot-emacs.el: Aliases for `eshell'.
  el/dot-emacs.el: Remove menu bar from dumb terminals.
  el/dot-emacs.el: Remove stray debugging code.
  el/dot-emacs.el: Emacs 22 doesn't have `whitespace-mode'.
  dot/bash_profile: Use Perforce configuration files.

* crybaby:
  emacs: Yet another spelling of `git' in `vc-handled-backends'.
  el/dot-emacs.el: Clobber `comint-highlight-input' properly.

diff --cc dot/emacs
Simple merge

diff --cc el/dot-emacs.el
Simple merge