Fixes #188 - Adding label overrides to video creation

Sorry about all of the whitespace changes, but this should fix issue #188 by checking for a label override before setting the label for the video.  **This is untested** since I couldn't really do it easily with my current dev install.  Hopefully it's not a huge burden for you to test.