Fix scenario names for invoicing
Merge similar scenarios using an Outline
Update features for capsuleCRM twiddling on self-signup