Updated how we deploy with optional apps
Merge remote-tracking branch 'origin/optional-app-deploy' into staging
Allow workflows to override the video URL (#1748)

Removed code to send the primary video URL to the editor.  We weren't
using it anywhere and it's unclear what we would want to send when the
workflow overrides the URL.
Bumping version
Merge pull request #1749 from pculture/gh-1748

Allow workflows to override the video URL (#1748)
Bumping commit.
Better choices for the video URL admin.

Switched from a static list of choices to using
video_type_registar.choices, which gets updated as we register new
video types.
Removed redundant query from Video.get_or_create_for_url

At the start of the method we call VideoUrl.get() and pass in a URL.
If that returns no results, we do a second get() call and pass in URL,
type and videoid.  There's no way that the second could return any
results there.
Changed VideoUrl uniqueness to (url, type) (#1750)

Added a migration for this and bumped up the South version slightly
because the old version wasn't working with newer mysql versions,
which we use for dev work (South issue #601).

Updated get_or_create_for_url to use (url, type) when it looked up
existing video URLs.
Changed VideoUrl.type length to 2.

This allows us to use the same system as Team.workflow_type.  If other
apps want to add new types, then we create a 2-char type with the
first char being unique to the app.  This makes it easier to ensure
that type codes stay unique.
Merge pull request #1751 from pculture/gh-1750

Gh 1750, looks great
Deleted a couple fixtures (#1753)

These seemed to be messing up the migrations and I don't think they
were doing anything positive.

The root initial_data.yaml file is still there, we probably could
delete that one too but I wasn't sure.
Allow forcing the video url for the subtitle editor
Switched the subtitle editor to a class-based view

This makes it easier to re-use the view and override certain behavior.
Refactored subtitle editor view some more

Split it up a bit and moved some of its code from module-level
functions to methods.  I think this new way is cleaner and also allows
us to subclass the view and override certain things.
Allow the editor view to set the redirect URL
Merge pull request #1754 from pculture/editor-view-refactor

Editor view refactor
Merge branch 'gh-1750' into staging
Added utility function for testing
Merge branch 'staging' into homepage-dean