Add alternate backstop calcs. Cleanup.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	webdice/dice.py
Change 'damage' to 'damages'. Several docstrings added.
new Object -> Object
Rename damages_terms variable
Change consumption_discount() per Nordhaus's Excel