Fixed wrong value in eland0

Nordhause uses 11 GtC per decade, not 1.1
Merge remote-tracking branch 'origin/master'

Conflicts:
	webdice/params.py
Merge remote-tracking branch 'origin/master'
Merge branch 'develop'
Merge branch 'develop'
Revert to good templates
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	webdice/templates/advanced.html
	webdice/templates/basic.html
Return initial parameter values
Put DICE version in params
Pluralize things
Limit abatement costs to output
Fix units in tax rate
Merge remote-tracking branch 'origin/develop' into develop
Optimization fixes
Merge branch 'master' into develop

Conflicts:
	webdice/dice/__init__.py
	webdice/dice/equations/productivity.py
Merge branch 'develop' into d3_work

Conflicts:
	webdice/dice/__init__.py
	webdice/templates/advanced.html
	webdice/templates/basic.html
numexpr to speed up BEAM
Remove annoying underscores
Cleanup parameters
data -> df, index -> i