Move flags back to _raw_main

SubcommandsOptionParser is supposed to be generic.
Tiny docs typos

Conflicts:
	docs/plugins/index.rst
Style cleanup in sorting
Fix namedtuple call