Clean up logic in GSF extrapolator
Clean up logic in GSF extrapolator -- still needs some work but this is a little less verbose and confusing. This moves the state merger from the extrapolator to the material effects where the state becomes larger
Mentioning @christos
Edited by Anthony Morley