For the display matrix return, return the composition of local changes with the changes based on the scaling type of the base imageView.
Merge pull request #122 from technicalcycling/master

Return the draw matrix instead of the supplemental matrix on getDisplayMatrix