Add video controls w/ playlist
Merge branch 'master' into gh-pages