Deprecate diagmm and diagmm! in favor of scale and scale!
Merge pull request #2918 from dmbates/master

Deprecate diagmm in favor of scale