make choose_candidate apply to both items and albums
make choose_candidate apply to both items and albums

(I can't try this out right now because I'm on an airplane. That might be true
of the next few commits, too. Horrible errors will be fixed later.)

google-code-export/beets,google-code-export/beets,google-code-export/beets