Merging Ernesto's recent SVN edits

In particular, src/gp/inc/SimulationModel.h -- this is for #29