Merge pull request #132 from jrrideout/death-march

Fixes #114 and #128
Factor command listing code out of __all__