Makes the carbonicity updates from awhile back actually work properly

Removes parameter CARBON, instead using cluster.carbonicity
Fixes #13
Merge branch 'hotfix-9.1.1' into develop