git difftool neglected to tell me about that conflict!
The Member spec was broken because usernames were removed with emails being used in place.
Now filtering the home page counts by whether the associated talk is viewable.
I forgot that I reorder them according to how they appear on the home page.
The counts_controller_spec also broke because of the reordering of the counts/totals.