Test the merge of CatsGotMyTonge's fork of Ice (TinyMCE v4 changes) with the upstream master (NYTimes)

@catsgotmytongue/ice/master, @nytimes/ice/master