reorganise typographic modifiers, add wordpress caption styles
Merge branch 'master' into gh-pages