Merge pull request #571 from IntersectMBO/dcoutts/merge-credits-scaling

Prototype: change credit scaling, using nominal vs physical credit

Author: dcoutts