making sure plupload mimetype gets registered
Merge branch 'master' of github.com:comfy/comfortable-mexican-sofa