Improved calculation of expected risk-free discount rate

Still experimental, some values hard-coded, the calculation happens in
Invest rather than CapMkt