added the token parser to the message body and subject. Also updated the...

... addresses.yaml naming to match what is in the config project.