make minor corrections for pull request
Merge pull request #111 from samuelshaner/develop

Fixed error in CMFD computeDs and increased segmentation performance
directory parameter for store_simulation_state
Merge remote-tracking branch 'upstream/develop' into develop