Changed calculation of E,C
Several definitions are possible (listed).  This one makes sense, although it means that the scaling by lifespan will be scaling by average lifespan <(s*(1-g(t)))>, since g is a fxn of t.  Still trying to figure out storage effects calcs