Remove the extra argument to utils.str.pluralize.

We previously had a second argument to utils.str.pluralize which determined
whether we truly plurazlied a word or not.  This has been removed so that
the function does what it says it does.

src/utils/str.py

@@ -247,13 +247,10 @@ def matchCase(s1, s2):
 
 consonants = 'bcdfghjklmnpqrstvwxz'
 _pluralizeRegex = re.compile('[%s]y$' % consonants)
-def pluralize(s, i=2):
-    """Returns the plural of s based on its number i.  Put any exceptions to
-    the general English rule of appending 's' in the plurals dictionary.
+def pluralize(s):
+    """Returns the plural of s.  Put any exceptions to the general English
+    rule of appending 's' in the plurals dictionary.
     """
-    if i == 1:
-        return s
-    else:
     lowered = s.lower()
     # Exception dictionary
     if lowered in plurals: