Merge lightbox changes into ckeditor

Need to catch this up to master first; right now it's behind and the merge looks a little hairy.