add some social login stuff
Merge branch 'master' of https://github.com/Bioconductor/biostar-central

Conflicts:
	biostar/settings/base.py
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/biostar-central
Merge branch 'master' of https://github.com/Bioconductor/support.bioconductor.org
Merge branch 'master' of https://github.com/Bioconductor/support.bioconductor.org
Merge branch 'master' of https://github.com/Bioconductor/support.bioconductor.org