Started working on AST scheme that has smaller template definitions
Merge branch 'master' of https://github.com/maaron/parse

Conflicts:
	tree.h
Fixed typo