Add tokens to Macro

Summary: A foolish consistency is the hobgoblin of little minds, adored by little statesmen and philosophers and divines.

Test Plan: Award a token to a macro.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D13725