Bug 1095199 — Standardize callback and cb use.
Merge pull request #262 from mozilla-services/1095199-cb

Bug 1095199 — Standardize callback and cb use.