Make short (and long) options, er, optional (II)

Sometimes you want either *only* a short option, or *only* a long one.  This patch allows specifying nil to #add_option in either position. This PR builds on #9.