Merge pull request #4 from ucbklu/master

OPENUCB-256: Temporary Form Alter to hide Feature Content checkbox and Categories lab...
Removed all the WYSIWYG stuff so we could do it in openberkeley_wysiwyg_override instead.
Merge pull request #5 from dsnopek/openucb-310

OPENUCB-310: Remove wysiwyg code -- moved to openberkeley_wysiwyg_override