1:1 setAssociation should not clobber fields - Adds a returning option to save
make sure options are defined
Merge pull request #1196 from mickhansen/association-attribute-clobber-fix

1:1 setAssociation should not clobber fields (fixes #1183)