Updated ckeditor to most recent version.

Added a couple of plugins and removed others from toolbar.
Put back in the Jeremy's span fix. While it *appeared* to work without it on the last test, that is not so. Don't know why it broke again but I put the fix back in anyway.