[Branch only] Merge refactor multiple editors

Reviewed @ https://github.com/code-dot-org/code-dot-org/pull/244