Ignore CMD options, and remove orphan nova cats

Previously, command options that were only use by commandline tools
were being included - especially for nova. This has been fixed.

The nova flag mappings were changed to merge some orphan categories.