Using "pre" instead of "pre-wrap" for white-space CSS property

pre:
Sequences of whitespace are preserved, lines are only broken at newline
characters in the source and at <br> elements.

pre-wrap:
Sequences of whitespace are preserved. Lines are broken at newline
characters, at <br>, and as necessary to fill line boxes.
Merge branch 'master' into gh-pages