Use the correct metrics calls for the kind of token we have.

Correct metrics branch. This fixes https://trello.com/c/CyslDw2q/131-message-api-has-metrics-calls-contained-but-these-are-not-being-logged-through-to-kissmetrics