Merge commit 'bwalton/bw/flexible_sent'

Conflicts:

	lib/sup/poll.rb
	lib/sup/sent.rb

diff --cc bin/sup
Simple merge

diff --cc lib/sup.rb
Simple merge

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