Fixing the income Adjustment in computeDemand

Simplified and fixed the income adjustment in compute demand which
wasn't working quite right before.
Structure of CS loop done

The main structure of the cs loop option is completed but solve is
having trouble. Need to simplify computeDemand to debug.
Revert "Fixing the income Adjustment in computeDemand"

This reverts commit e5d27c95bed0b8aecdfb19d7630d065156a2f22b.