Merge pull request #1278 from stevewithington/develop

cleanup and fix minor issues in ckeditor/config.js.cfm