Reversing the array_merge so that it is possible to override the 'media_buttons' and 'tinymce' settings
Cleaning up whitespace
Merge pull request #139 from JoshKoberstein/master

Editor Default Settings Override