fixes #164, fixes #116: changed video to use canvas
Merge pull request #14 from BrianAdams/merge1212

Merged changes back to local master
Merge pull request #16 from BrianAdams/master

Added in video perf fixes