Update singular and plural rules in AgaviInflector and fix an error where it does not handle uncountable words as part of strings. Also adds a boatload of tests. Closes #1460 and closes #1459