Merge branch 'logging'

diff --cc bin/sup
Simple merge

diff --cc lib/sup/maildir.rb
Simple merge

diff --cc lib/sup/textfield.rb
Simple merge

diff --cc lib/sup/thread.rb
Simple merge