Editor updates

Editor updates, buried in among a history of other commits that I thought had already been merged, but they show up here because apparently the haven't been.

Anyhow, this is from the branch I've used to encapsulate editor changes, kept up to date from codalab/master...