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

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

* 'master' of http://git.distorted.org.uk/~mdw/profile:
  el/dot-emacs.el: Magit colouring.
  dot/emacs: Some imenu tweaking.
  dot/emacs: Have Message use the From header as the envelope sender.
  dot/bash_profile: Eliminate the already-run guard.
  dot/ercrc.el: New IRC command `/GREET' to greet robots.
  dot/ercrc.el: New definitions for distorted.org.uk IRC server.
  dot/mykermrc.in: Useful commands for dealing with server consoles.
  dot/ercrc.el: Add an extra entry for chiark via greenend VPN.