Added combined option for allocation

'Combined' option takes into account both resource limitation (Waring) and growth (Dickenson, LAI). This has primarily been tested and will be tested for grasses. Original waring parameters (waring_pa and waring_pb) now control the exponential decay constant for dickenson (old dickenson_pa, new k_dickenson).