Bug fixes
Added DS_Store to gitignore
First set of tokenizer tests

Needs change to config too
First set of tokenizer rules
More tests and some minor fixes
Special Char rule test
Merge remote-tracking branch 'upstream/master'