TinyMCE 4 support and spec refactoring for 2-1-stable

spec refactor and TinyMCE 4 support. Should be able to pull right in.