Make oauth_token retrieval optional. Refs #212