Support flags as well as options with values.
Merge pull request #140 from mesosphere/wip-extended-options

Support flags as well as options with values.