Merge commit 'origin/labels-rework'

diff --cc bin/sup
Simple merge

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

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