change all model assocations to reflect has_many :through instead of has...

..._and_belongs_to_many