Re-enable diffs now that we have the two-spec version as the status quo
Update Makefile to copy diffs to the build directory
Merge pull request #110 from ndw/diff-fixup

Fixup the diffs