Merged forgotten "disable-stream-2-wrap" option.

Added "disable-stream-2-wrap" to options. This allows us to get rid of
the "wordwrap_output_left_padding" function, since stream-2-wrapping
was the only thing which still required it.