Upgrade Media and File Entity modules

WARNING! Please let me (Craig) pull this change down to cerberus after it has been merged into master. We're going to have to properly uninstall the old Media and File Entity modules first before we replace the module files. Otherwise we'll get a flurry of error messages, and who knows what madness will be left behind in the database.