Add ability to override the associations used in .history_timestamps
Fix has_many :through associations