be more explicit about information as it is passed around
Merge branch 'heap-size-fix' into clean-up-api

Conflicts:
	formtranslate/api.py
Merge branch 'clean-up-api' into autostaging
Merge remote-tracking branch 'origin/update-jar' into autostaging