Merge branch 'various-api-refactors' into next

diff --cc lib/sup.rb
Simple merge

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

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

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

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