Changed token type validation to be case-insensitive.
Fixed string import clash
Merge pull request #129 from andy-shea/tokentypefix

Changed token type validation to be case-insensitive