Intermediate updates on the way to normalizing using std dev of all scores of a type.  Stuff's broken but I don't want to lose it.
Merge remote-tracking branch 'origin/master'