Basic cleanups to CKEditor config
Merge pull request #1991 from darkwing/ckeditor-config-cleanup

Basic cleanups to CKEditor config