fixing up update_references
fixed update_references merge conflict
further polishing update_references
even further polishing update_references
added failing inclusion comment spec
Merge branch 'master' into cardrefs
fixed update_references merge
fixed update_references brokenness