Consolidated tokenization to one function.
Merge pull request #32 from swglad/config-file-updates

Consolidated tokenization to one function.