Remove tillwp, add bwat, bwatvel to output_medium. See #264.

Also: ensure that output_big is a strict superset of output_medium and
sort these lists.