Combined video and videoalpha acceptance tests.
Resolved conflict between two steps with the same name.
Fixed incorrect videoalpha template name
Changed videoalpha stub to exclude video sources, but include
the rest of the player.
Changed stubbing behavior in video templates to exclude
only the sources (not the player)
Updated video alpha template name to reflect recent changes in master.
Merge pull request #197 from edx/will/fix-video-acceptance-tests

Will/fix video acceptance tests