Makeup Tokens

Including some additional variables for enrollment email in makeup tokens