Moved Video into submodule, tons of cleanup
Rewrote video class.
Merge branch 'origin-nil' into origin-v0.2.1

* origin-nil:
  Rewrote video class.
  Moved Video into submodule, tons of cleanup