diff --git a/lib/cli.js b/lib/cli.js
index 8839c6b30..9890f3954 100644
--- a/lib/cli.js
+++ b/lib/cli.js
@@ -1,6 +1,8 @@
 /**
  * The command line interface for interacting with the Protractor runner.
  * It takes care of parsing the config file and command line options.
+ *
+ * Values from command line options override values from the config.
  */
 
 var util = require('util');
@@ -8,7 +10,9 @@ var path = require('path')
 var fs = require('fs');
 var runner = require('./runner.js');
 var argv = require('optimist').
-    usage('Usage: protractor [options] [config]').
+    usage('Usage: protractor [options] [configFile]\n' +
+        'The [options] object will override values from the config file.\n' +
+        'See the reference config for a full list of options.').
     describe('version', 'Print Protractor version').
     describe('browser', 'Browsername, e.g. chrome or firefox').
     describe('seleniumAddress', 'A running seleium address to use').
@@ -18,7 +22,7 @@ var argv = require('optimist').
     describe('rootElement', 'Element housing ng-app, if not html or body').
     describe('specs', 'Comma-separated list of files to test').
     describe('verbose', 'Print full spec names').
-    describe('includeStackTrace', 'Print stack trace on error').
+    describe('stackTrace', 'Print stack trace on error').
     describe('params', 'Param object to be passed to the tests').
     alias('browser', 'capabilities.browserName').
     alias('name', 'capabilities.name').
@@ -26,10 +30,8 @@ var argv = require('optimist').
     alias('platform-version', 'capabilities.version').
     alias('tags', 'capabilities.tags').
     alias('build', 'capabilities.build').
-    boolean('verbose').
-    boolean('includeStackTrace').
     alias('verbose', 'jasmineNodeOpts.isVerbose').
-    alias('includeStackTrace', 'jasmineNodeOpts.includeStackTrace').
+    alias('stackTrace', 'jasmineNodeOpts.includeStackTrace').
     check(function(arg) {
       if (arg._.length > 1) {
         throw 'Error: more than one config file specified'