Merged together SimuForest and the old cellular_forest