Merge branch 'master' into gh-pages
carousel works (including with video)

no controls on video - add these and a play button programmatically.
added "watch video" button in right rail
Merge branch 'gh-pages'