version-bump paper_trail
remove merge cruft
per block or per-spec versioning; matcher