Changed to directly use reflect so the through class doesn't need to also be a can_include
Merge branch 'has-many-through' into alltogether-now