A number of bug fixes from structured-blocks.
Merge branch 'master' of github.com:Khan/live-editor