"rowspan" -> "colspan"

screwup, pulled wrong branch in; other changes match PR