Build the export list for traits correctly.
Merge branch 'master' of git+ssh://git.eigenstate.org/git/ori/mc
Merge branch 'master' of git+ssh://git.eigenstate.org/git/ori/mc

Conflicts:
	parse/infer.c
	parse/use.c