attempts to fix broken text editor
Merge branch 'master' into fix-ckeditor
trying to fix random broken spec
put back gem needed for ckeditor
Merge branch 'master' into fix-ckeditor
Merge pull request #349 from G5/fix-ckeditor

attempts to fix broken text editor