Video sprint30

Video team sprint work for the last two weeks.  Each commit has been code reviewed within the team, QA'ed by Yev, and product reviewed by Yoko.