Supybot is dead, long live Limnoria
Consistently use MERGE when describing custom merge tools
ShrinkUrl: use x0 by default. Fixes #617.
ShrinkUrl: Remove xrl.us
ShrinkUrl: Remove ln (Closes #618).
Crash for commands with ambiguous getopts shortcuts and no docstring
Applied, along with the subsequent test fix.
Crash for commands with ambiguous getopts shortcuts and no docstring