Fixed issue with aggregate_rows not caring about which field a join was made on when multiple ForeignKeyFields exist targeting the model the join was made on
Merge pull request #471 from arrowgamer/master

Fixed issue with aggregate_rows