Worked around a bug in vocab update

Basically, if a word never occurs in the train set, its probability is
zero, which causes NaNs in the query set

Also backed out of the prior changes.
More logging in main test
Start working in topic prior