use units
remove shadowed binding
Merge pull request #46 from diagrams/units

Updates to work with new `Measure`s etc.