Option to not pluralize associated table names (branch 1.7.0)

In v1.7.0rc6 the pluralization of associated table names was introduced.

This pull request introduces a new option to return to how it behaved pre v1.7.0rc6.

This pull request is for branch v1.7.0. There is another pull request for latest master
Can you add some spaces in the appropriate places?