Update for new measure and sizespec.
Updates to SizeSpec.
merge
fix merge conflicts
Fix sizeSpec
More merge fixes
Merge pull request #13 from diagrams/new-stuff

New stuff