Added displayOpt down the pipeline

Checkpoint.  Added displayOpt to QValue's and Collection's version of
wikify(), so we can now pass it from top to bottom.  Hopefully after all
that, I'm correct about how this will work.

Also, renamed Optional.None to QNone, to avoid name-collection errors
with Option.None.