Simplified auth
Fixed whitespace
Merge branch 'whitespace'
Merge branch 'simpler_auth'