if we are making a special case for octopus, then lets get it right

I will also happily modify this to just do octopuses (also added moose to uncountable, but resisted urge to change [/^([v|b]ox|ox)en/i, '$1'])
mistake?