Merge proposals dependent on lp:~lukasz-czyzykowski/django-openid-auth/switch-useropenid-user-to-raw-id

1. switch-useropenid-user-to-raw-id
2. Dependent merge proposals