Merge pull request #17 from junmendoza/master

Codegen refactor - variable rename, submit missing parser file change, merge changes from upstream
partial swap to from Core to CompileStateTracker