Unmark 1.7.1.1

This release fixes a bad merge. Totally @cdevroe's fault.

Two things:

• Duplicate ngettext functions
• Calling unmark_ngettext that didn't exist

If you installed 1.7.1 please upgrade to this immediately.