Fix dispatching of subcommands (concerning :help and *args) (#374)

@sferik requested that @teeniimoodi rebase latest master, resolve conflicts and make sure tests pass in pull request (#374).  I did those things and the tests passed.