Minor fixes
Split except clause for handling different exceptions
Move check for acceptable markup filter values to get_markup_filter_name()
Add get_markup_filter()

Now get_markup_filter_name() only returns a nice version of the filter name
for showing on the UI.
Fall back to HTML markup when markup configured module is missing

This fixes bug #2380.