Refactor code to use OAuthToken more often instead of duplicate functionality
Merge pull request #282 from stloyd/feature/token_usage

Refactor code to use OAuthToken more often instead of duplicate functionality