Merge remote branch 'ponder'

* ponder:
  dot/Xdefaults: Add more Xft settings.
  el/dot-emacs.el: Configure dired faces.
  el/dot-emacs.el: Don't turn on outline-minor-mode all the time.
  dot/emacs: Remove lots of minor-mode verbiage.

diff --cc dot/emacs
Simple merge