sync up provider id (bug 940524)
Merge pull request #167 from andymckay/940524

sync up provider id (bug 940524)
Upgrade rest framework
Merge pull request #168 from kumar303/upgrade-drf

Upgrade rest framework
Proxy http error (404s, etc) correctly
Merge pull request #170 from kumar303/proxy-http-status

Proxy http error (404s, etc) correctly
No need to override token check (bug 938314)
make zippy basic use solitude
Stale comment. Fixed errors couple commits ago
Warn about no oauth since it's probably a mistake
Merge pull request #171 from andymckay/fix-zippy-basic

make zippy basic use solitude
add in some zippy docs
and add zippy in to the toc
Adding terms to provider (bug 932581)

https://bugzilla.mozilla.org/show_bug.cgi?id=932581
Merge pull request #169 from davidbgk/932581-zippy-terms

Adding terms to provider (bug 932581)
Merge error, zippy-basic now uses directly URLs
Merge pull request #172 from davidbgk/master

Merge error, zippy-basic now uses directly URLs
Turning Zippy's resource_uri into a solitude one (bug 942222)
Merge pull request #174 from davidbgk/942222-resource-uri

Turning Zippy's resource_uri into a solitude one (bug 942222)
call the right bloody api (bug 941054)