Upgrade to allow different types of tokenizers. Added csv strtk and
custom.
Merge remote-tracking branch 'origin/master'