Actually tokenize source to reason about it
Merge pull request #24 from richo/features/sane_parsing

Actually tokenize source to reason about it