rename Option -> OptionValue

... so it doesn't shadow scala's builtin Option type.

separating this from my next changes, which add import support.