Improve Tokenizer with CSV and TSV plus change default to StringTokenizer like includes code from Matthew Inger