Fix error in video tag. Fixes #1127.
Merge branch '2.1' of github.com:imathis/octopress into 2.1

* '2.1' of github.com:imathis/octopress:
  Updating the classic theme should work again
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1