incorporated model changes as suggested by Jason.

@chrisndodge Kindly merge in the shopping-rewrite branch once test passes.

Thanks
hmmm. This seems incorrect and you are picking up a model change from a different PR. @wedaly I believe made this change and there should be a migration for it already. Perhaps - after rebasing - you didn't run forward migrations?