Use the correct metrics calls for the token we have.
Convert the remaining calls as this is never called from a server; fix tests.
Merge pull request #27 from tidepool-org/kjq/fixmetrics

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