Merge proposals dependent on lp://staging/~stuartmetcalfe/django-openid-auth/store-assigned-groups

1. store-assigned-groups
2. Dependent merge proposals