Catch up on changes to collection.py

Here are the changes in collection.py up to 2.0.14 which include the rest of the new burying behaviour.

I still need to make the relevant UI changes to use the new options, but after that the burying stuff should be done.