Changed the tokenizing logic to directly modify the strings
Reworked word logic to be handled by a C++ style tokenizer
Merge commit 'dc0b159'
Merge commit 'a5cc56d'