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

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

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/profile: (125 commits)
  dot/emacs: Align Org mode tags to the proper column in agenda view.
  el/dot-emacs.el: Distinguish whether diary entries are processed for Org.
  dot/emacs: Put `org-remember' in with the rest of the Org-mode bindings.
  dot/emacs: Better grip on when `M-x calendar' shows things.
  dot/emacs: File organizational stuff under `brain'.
  dot/emacs: Squish Debbugs-style email addresses to the submission address.
  dot/emacs: Don't snarf addresses from boring mailboxes.
  dot/gnus-local.el.distorted: Send letsencrypt.org nagmail away.
  dot/emacs: Pick the right master diary file.
  dot/tmux.conf: Some more bindings.
  dot/tmux.conf: Order roughly by key.
  dot/gnus-local.el.distorted: Set primary newsserver to chiark for now.
  el/dot-emacs.el: Add a (lightly modified) `nntp-open-authinfo-kludge'.
  el/dot-emacs.el: Trim leading spaces from diary entry strings.
  dot/emacs: Fix the date-format regexps to not eat a following time.
  dot/emacs: Display times in 24-hour clock, please.
  el/dot-emacs.el: Add Discordian date conversion.
  dot/emacs: Use newer diary hook functions if they're available.
  dot/emacs: Don't try to sort the diary buffer.
  dot/emacs, el/dot-emacs.el: Better Emacs version checking.
  ...

Conflicts:
	dot/bashrc: Various prompt enhancements.