Merge branch 'transcoding_progress'

This probably broke stuff

diff --cc .gitignore
Simple merge

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

diff --cc mediagoblin/media_types/video/processing.py
Simple merge

diff --cc mediagoblin/templates/mediagoblin/media_displays/video.html
index 8e3a202ff9c88c313f254e76f3dc11c900e58407,61baf11c56c8d4080ca0311f8f93a3e7df0a17ee..31825bfdfba30cae0a7a1f3b7b871325530408c5
--- 1/mediagoblin/templates/mediagoblin/media_displays/video.html
--- 2/mediagoblin/templates/mediagoblin/media_displays/video.html
+++ b/mediagoblin/templates/mediagoblin/media_displays/video.html
@@@ -59,11 -63,9 +63,13 @@@
                type="{{ media.media_data.source_type() }}"
              {% else %}
                type="{{ media.media_manager['default_webm_type'] }}"
-             {% endif %} />
-     {%- for subtitle in media.subtitle_files %}
+             {% endif %}
+             label="{{ each_media_path[0] }}" res="{{ each_media_path[1][1] }}" />
++          {%- for subtitle in media.subtitle_files %}
 +            <track src="{{ request.app.public_store.file_url(subtitle.filepath) }}"
-               label = "{{ subtitle.name }}" kind="subtitles" >
-     {%- endfor %}
++              label="{{ subtitle.name }}" kind="subtitles">
++          {%- endfor %}
+     {% endfor %}
      <div class="no_html5">
        {%- trans -%}Sorry, this video will not work because
        your web browser does not support HTML5 

diff --cc mediagoblin/user_pages/views.py
Simple merge