Cleanup following OAuth2 merge
Merge pull request #66 from jateeter/master

Cleanup following OAuth2 merge