Simplify command line and options processing.

Remove some special case flag processing and rely on commander.js more.
Move referrer option from System to options.js.
wrong indentation