DSA-52: Unlink an OAuth2 provider
DSA-49: Implement endpoint for linking additional OAuth2 providers
DSA-53: Add mock to requirements
Merge pull request #20 from thehackerati/DSA-52

DSA-52: Unlink an OAuth2 provider
Merge pull request #22 from thehackerati/DSA-53-1

DSA-53: Add mock to requirements
Merge branch 'master' into DSA-49

Conflicts:
	oidc/views.py
DSA-49, small fix
DSA-49, update admin panel to show provider account email
Merge pull request #21 from thehackerati/DSA-49

DSA-49: Implement endpoint for linking additional OAuth2 providers
Merge branch 'master' into DSA-41

Conflicts:
	oidc/tests.py