after commit-remorse, change option.group to option.conditions... the conditions under which the option will be available. Much more extensible.

Also, include an orphaned file.