Use actual variables from gvars to be changed on the command-line.
Remove these options from argparse.
Change Options.cmpopts reference to VLOG.OPTIONS.
Remove cmpopts, it has been merged with VLOG.OPTIONS.
Fixed conflicts.

nothing to commit, working directory clean
Merge branch 'cmd_line' into devel
Minor cleanup to project.py.