Merge branch 'gh-pages'
mostly done. feeling good about this.
webm support
Merge branch 'master' into gh-pages