Make subcommands finally work properly

Benjamin Mako Hill || Want to submit a patch?