Merged SimulateOptions and SimulationSettings, we now have a single consistent way of
setting simulation settings.

Correctly implemented std templates in the SWIG wrapper.