social auth stuf
Merge branch 'master' of https://github.com/socialsyntax/socialsyntax-web
Merge branch 'master' of https://github.com/socialsyntax/socialsyntax-web