remove OAuth (there's a new form of authentication coming soon)
Merge 'master' based on code review