pushing
added video seek functionality, scrub tests
merging
gerge branch 'master' of https://github.com/jaredstanley/canvas-stuff