Merge branch 'dont-canonicalize-email-addresses' into next

diff --combined lib/sup.rb
index f855964151863f8a29bc18b43cb9e2952e894fda,3afac5e012b0e9438434981fa2ebaae068ec9ea4..6d9f12531232bf888f0036a7027c5a8fb0a2e11e
--- 1/lib/sup.rb
--- 2/lib/sup.rb
+++ b/lib/sup.rb
@@@ -53,7 -53,6 +53,6 @@@ module Redwoo
    COLOR_FN   = File.join(BASE_DIR, "colors.yaml")
    SOURCE_FN  = File.join(BASE_DIR, "sources.yaml")
    LABEL_FN   = File.join(BASE_DIR, "labels.txt")
-   PERSON_FN  = File.join(BASE_DIR, "people.txt")
    CONTACT_FN = File.join(BASE_DIR, "contacts.txt")
    DRAFT_DIR  = File.join(BASE_DIR, "drafts")
    SENT_FN    = File.join(BASE_DIR, "sent.mbox")
@@@ -115,7 -114,6 +114,6 @@@
    end
  
    def start
-     Redwood::PersonManager.new Redwood::PERSON_FN
      Redwood::SentManager.new Redwood::SENT_FN
      Redwood::ContactManager.new Redwood::CONTACT_FN
      Redwood::LabelManager.new Redwood::LABEL_FN
@@@ -125,13 -123,11 +123,12 @@@
      Redwood::PollManager.new
      Redwood::SuicideManager.new Redwood::SUICIDE_FN
      Redwood::CryptoManager.new
 +    Redwood::UndoManager.new
    end
  
    def finish
      Redwood::LabelManager.save if Redwood::LabelManager.instantiated?
      Redwood::ContactManager.save if Redwood::ContactManager.instantiated?
-     Redwood::PersonManager.save if Redwood::PersonManager.instantiated?
      Redwood::BufferManager.deinstantiate! if Redwood::BufferManager.instantiated?
    end
  
@@@ -283,7 -279,6 +280,7 @@@ require "sup/tagger
  require "sup/draft"
  require "sup/poll"
  require "sup/crypto"
 +require "sup/undo"
  require "sup/horizontal-selector"
  require "sup/modes/line-cursor-mode"
  require "sup/modes/help-mode"