Refactoring of simulation building in preparation to make runs for differing models easier
Made model switching a lot easier and the main method a lot cleaner
Merge branch 'master' of https://github.com/bokbok/masters_project