Made the token plugin more generic so it can be used for other types of tokens.
Made the token plugin more generic so it can be used for other types of tokens.

EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing,EduPepperPDTesting/pepper2013-testing