Change the remaining imports of django.util.translation.ugettext to use util.markup.ugettext
Also provide a wrapper for ungettext