Fastforward media version to include ckeditor wysiwyg refactor.

Moves media forward and applies latest work from the community
in improving the macro handling for filtering media element tokens
when the editor binds and unbinds. Applies patch to fix error in
media_ckeditor plugin that inappropriately strips tokens due to
the use of a custom wrapper.
Merge pull request #10 from kevinchampion/improve_token_handling

Bug fixes: Fastforward media version to include ckeditor wysiwyg refactor.