matrix-spec-proposals

Refactor a bunch of the logic in matrix_templates/units.py

#255

Merged