More robust word and noun phrase tokenizing

Now, single punctuation marks will not be included