tone down comment about strong normalization, close #649
Merge branch 'master' into snorm

Conflicts:
	formal.tex
oops, didn't complete merge
Merge pull request #667 from mikeshulman/snorm

tone down comment about strong normalization, close #649