small changes
Merge branch 'master' of https://github.com/isiloron/excellent-mustache

Conflicts:
	ourt42/ourt42/trac42.y
	ourt42/ourt42/trac42.y.c