Move the 'contains' logic into an association
Merge pull request #587 from projecthydra/contains_association

Move the 'contains' logic into an association