Explicitly select different media object types

* Using `> *` is nice but means if an image is wrapped in a <figure> then
  the styles are applied incorrectly
Merge branch 'master' into gh-pages

* master:
  Explicitly select different media object types
Update test page