Merge Duplication Divergence Graph Generator (#1210)

Merge #1210 with cleanup.
Doh, I keep getting bitten by that.  Yes, will do.