Merge ORCalculator into it's only subclass
Merge pull request #4723 from dimagi/rm-or-calculator

Merge ORCalculator into it's only subclass