Merge branch 'master' of git://git.distorted.org.uk/~mdw/profile

* 'master' of git://git.distorted.org.uk/~mdw/profile:
  dot/emacs: Fix `@BASH@' entry in `interpreter-mode-alist'.
  dot/xinitrc, dot/xmodmap, setup: Configure keyboard using xmodmap files.
  dot/emacs: Longer logs by default in Magit.
  dot/emacs: Recognize `@BASH@' in shebang lines.
  el/dot-emacs.el: Apply reStructuredText face settings after load.
  el/dot-emacs.el: Define some faces for reStructuredText.
  el/dot-emacs.el (mdw-fontify-pythonic): Handle word boundaries better.
  el/dot-emacs.el: Magit colouring.
  dot/emacs: Some imenu tweaking.
  dot/emacs: Have Message use the From header as the envelope sender.

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