Merge branch 'better-buffer-list'

diff --cc bin/sup
Simple merge

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

diff --cc lib/sup/modes/edit-message-mode.rb
Simple merge

diff --cc lib/sup/modes/thread-index-mode.rb
Simple merge

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