Change consumption_discount to match Nordhaus's Excle. Add docstrings to equations.
Merge remote-tracking branch 'origin/develop' into develop