Merge pull request #111 from samuelshaner/develop

Fixed error in CMFD computeDs and increased segmentation performance
Fixed merge conflict
Fixed merge conflict with mit-crpg/OpenMOC/develop