it's been a while; major addition is MacroExpander & some progress on the thesis text; also features a lot of small cosmetic improvements
oops, forgot to add the thesis file; also removed the recognizer in favor of the matcher, but currently investigating performance issues
fixed the perf issue: forgot to memoize; also fixed some remaining merger bugs