Merge pull request #73 from seancarr/master

Revert "Revert "update unsetAssociations to also unset the database refe...