preparation for term indices
Merge branch 'master' into termindex

Conflicts:
	src/Infer.hs