Combined Process Parameters options back together in Simulation.cpp (to reduce code duplication)
Merge branch 'master' of https://github.com/gandalfcode/gandalf