ignoring decaf theme
merged
tinymce now just shows up automatically (like it did before!)