Always update parent's state before causing a local refresh
Add comments documenting a hack
Merge branch 'fast-typing-bug'

Conflicts:
	app/assets/javascripts/client-prod.js