Changed plural and singular regular expressions to shortcut words
that already *look* singular or plural. Without, nouns like 'status',
'alias', 'bus', 'octopus' cause an error, and scaffolding fails. Eg,
'status' didn't have a match in singular, so it would continue until
it hit the most generic case, and get 'singularized' as 'statu'. This
causes a cascading error. Modifying the regex to match 'status' *or*
'statuses' provides a shortcut test.