Merge commit 'crybaby/master'; commit 'ponder/master'

* commit 'crybaby/master':
  bash_profile: Extend the collection of INFOPATH directories.

* commit 'ponder/master':
  zile: Yet another editor configuration.
  emacs: Give org-iswitchb a key binding, and include diary stuff in agenda.
  emacs, dot-emacs.el: Extend and semi-automate evil-keymap hacking.
  dot-emacs.el: Insert missing blank line before section header.

diff --cc bash_profile
Simple merge

diff --cc dot-emacs.el
Simple merge

diff --cc emacs
index 2d0aaff63b09693cdf83cbdb6c66796d2b7c47a2,dcb561d4c6fcaa2676b8ef5dc5334a0da476972a,ba6c4421405c366b52a0043b74c8ccc3d2ba613d..4337d391d09d8b9b4893afd30f2ffcd4c6279717
--- 1/emacs
--- 2/emacs
--- 3/emacs
+++ b/emacs
@@@@ -121,18 -121,7 -121,6 +121,18 @@@@
   (setq sendmail-program "~/bin/sendmail-hack")
   
   (setq mail-user-agent 'message-user-agent)
 - (setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$")
 ++(setq message-signature-separator "^-- \\(\\|\\[mdw\\]\\)$"
 ++      message-yank-prefix "> "
 ++      message-yank-cited-prefix "> "
 ++      message-indent-citation-function '(message-indent-citation
 ++                                      mdw-trim-spaces-after-citing))
 ++
 ++(defun mdw-trim-spaces-after-citing ()
 ++  (save-excursion
 ++    (save-restriction
 ++      (narrow-to-region (point) (mark t))
 ++      (while (re-search-forward "^> +$" nil t)
 ++     (replace-match ">")))))
   
   (and (fboundp 'turn-on-gnus-dired-mode)
        (not mdw-fast-startup)