Merge diff-subunit installation fix, change diff-subunit to subunit-diff.