- Jonathan's "HTML filter" improvements.

> If turning on both filters is bad, we shouldn't allow the user to
> select both, should we? The attached patch folds the Escape HTML option
> into the same dropdown as the Filter HTML option, preventing both from
> being activated.