Merge branch 'master' into processing

diff --cc mediagoblin/db/models.py
Simple merge

diff --cc mediagoblin/submit/views.py
index f19bf22e29bcc2a8578e5e069c6dc4c71514f028,ba13b755ce12f5a811d9a3fcd2af5c57ea9152d5..59d8fe3f4e318b74cb0c97f09351bd22621eb1ca
--- 1/mediagoblin/submit/views.py
--- 2/mediagoblin/submit/views.py
+++ b/mediagoblin/submit/views.py
@@@ -84,10 -91,9 +91,10 @@@ def submit_start(request)
              entry.save(validate=True)
  
              # queue it for processing
 -            process_media_initial.delay(unicode(entry['_id']))
 +            result = process_media_initial.delay(unicode(entry['_id']))
 +            entry['queued_task_id'] = result.task_id
  
-             add_message(request, SUCCESS, 'Woohoo! Submitted!')
+             add_message(request, SUCCESS, _('Woohoo! Submitted!'))
  
              return redirect(request, "mediagoblin.user_pages.user_home",
                              user = request.user['username'])