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'
Replacing charts with d3
Cleanup merge cruft
Return initial parameter values
Put DICE version in params
Pluralize things
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
Add optimized scaling and tolerance attributes
Old merge from develop branch
Add numexpr equations