Stashing changes which will be overwritten
Merge branch 'media-plugin' of github.com:wysiwhat/Aloha-Editor into media-plugin
Merge branch 'media-plugin' of https://github.com/wysiwhat/Aloha-Editor into media-plugin
Merge branch 'media-plugin' of github.com:wysiwhat/Aloha-Editor into media-plugin
Merge branch 'media-plugin' of github.com:wysiwhat/Aloha-Editor into media-plugin
Merge branch 'media-plugin' of https://github.com/wysiwhat/Aloha-Editor into media-plugin
Cleaned up some of the extra code left over from our debugging