Various OAuth updates
Merge pull request #346 from khawkins/update_oauth

Various OAuth updates