getting up-to-date on lactuca
Still fixing merge. SEIR.cpp is old.