Fixes and tests for through-associations, named through-associations
Fucking forgot to add file
Merge commit 'ebf2ad2a1d6ccadc7c45f97c6c46f8d375b8a4db' into pg-update