[queso]: merging ernesto's edits to Simulation Model file.
[queso]: adding Ernesto's edits to Simulation Model. Ticket #29 is ready for review.
Tidy up double-underscore

Actually I just realised this was only in a comment.  Oh well.
Merge pull request #52 from dmcdougall/ernesto

Merge Ernesto's svn commits