ignoring decaf theme
merged
tinymce now just shows up automatically (like it did before!)
merge attempt #2?
leftover stuff from recent merge
mediacore