Script update merge

Rebased against dagmc develop