Fixed spaces to tabs
Merge branch 'master' of https://github.com/knagra/farnsworth
Fixed the settings for social_auth_pipeline
Merge branch 'master' into kingman