Add combined option for allocation

'Combined' options takes into account both resource limitation (Waring) and growth (Dickenson, LAI). Testing primarily on grasses.