herd: Add locations to model AST
herd: Add locations to model AST, part II
Merge branch 'master' of github.com:herd/herdtools

Conflicts:
	herd/herd2lem.ml