computeDemand streamlined

Simplified the computations in compute demand to avoid errors. New
method allows us to have the upper Limit as Inf as it should be. It also
directly measures the last block a household consumes in.
Merge remote-tracking branch 'origin/master' into loop_cs

Conflicts:
	simulation.m