Revert "OPENUCB-203: Merge 'Editor' format into 'WYSIWYG' and add permis...

Reverts ucb-ist-drupal/openberkeley_wysiwyg_override#4

@dsnopek  and @cboyden : Oops -- I was looking at too many PRs at once and unintentionally merged this PR instead of a different one. Re-opening since CB is testing with OPENUCB-203.