Fix method signature to match changes in Rails 3.1.
Fix method signature to match changes in Rails 3.1.

Rails' build_association methods now take a hash of attributes and a
hash of options.

chinshr/merchant_sidekick