Some cleanup (variable naming, comments...)
Merge branch 'master' of github.com:texttheater/produce

Conflicts:
	produce