No longer add resources from active consumption into acu/scu upgrades, f...

Fix for #9
Yeah these have been warped back and forth many times over, in many commits, unfortunately.

I'll remember this when we compile a style guide, per issue #20.