Merge branch 'video_gstreamer-only'

Conflicts:
	mediagoblin/db/migrations.py
	mediagoblin/submit/views.py

mediagoblin/storage/cloudfiles.py

@@ -98,8 +98,14 @@ class CloudFilesStorage(StorageInterface):
     def delete_file(self, filepath):
         # TODO: Also delete unused directories if empty (safely, with
         # checks to avoid race conditions).
-        self.container.delete_object(
-            self._resolve_filepath(filepath))
+        try:
+            self.container.delete_object(
+                self._resolve_filepath(filepath))
+        except cloudfiles.container.ResponseError:
+            pass
+        finally:
+            pass
+        
 
     def file_url(self, filepath):
         return '/'.join([