update to error marking classes in matching
Merge remote-tracking branch 'origin/13/2/14---matching-engine-updates' into 1/22/13-david