Extended keys documentation and set bools instead of changing flags i…

…n the keys assertion

lib/chai/core/assertions.js

@@ -960,12 +960,24 @@ module.exports = function (chai, _) {
   /**
    * ### .keys(key1, [key2], [...])
    *
-   * Asserts that the target has exactly the given keys, or
-   * asserts the inclusion of some keys when using the
-   * `include` or `contain` modifiers.
-   *
-   *     expect({ foo: 1, bar: 2 }).to.have.keys(['foo', 'bar']);
-   *     expect({ foo: 1, bar: 2, baz: 3 }).to.contain.keys('foo', 'bar');
+   * Asserts that the target contains any or all of the passed-in keys.
+   * When used in conjunction with `all`, every key that is passed in
+   * must exist in the target object. 
+   * 
+   * When used in conjunction with `any`, at least one key that is passed 
+   * in must exist in the target object. Use without the `any` or `all` 
+   * qualifiers is deprecated and will default to `all`. 
+   * 
+   * Finally, use of `contains` in conjunction with `all` requires that
+   * the number of passed-in keys match the total number of keys in the target
+   * object.
+   * 
+   *     expect({ foo: 1, bar: 2 }).to.have.any.keys('foo', 'baz');
+   *     expect({ foo: 1, bar: 2 }).to.have.any.keys('foo');
+   *     expect({ foo: 1, bar: 2 }).to.contain.any.keys('bar', 'baz');
+   *     expect({ foo: 1, bar: 2 }).to.contain.any.keys(['foo']);
+   *     expect({ foo: 1, bar: 2 }).to.have.all.keys(['bar', 'foo']);
+   *     expect({ foo: 1, bar: 2 }).to.contain.all.keys(['bar', 'foo']);
    *
    * @name keys
    * @alias key
@@ -986,22 +998,24 @@ module.exports = function (chai, _) {
 
     var actual = Object.keys(obj)
       , expected = keys
-      , len = keys.length;
+      , len = keys.length
+      , any = flag(this, 'any')
+      , all = flag(this, 'all');
 
-    if (!flag(this, 'any') && !flag(this, 'all')) {
-      flag(this, 'all', true);
+    if (!any && !all) {
+      all = true;
     }
 
     // Has any
-    if (flag(this, 'any')) {
+    if (any) {
       var intersection = expected.filter(function(key) {
         return ~actual.indexOf(key);
       });
       ok = intersection.length > 0;
     }
 
     // Has all
-    if (flag(this, 'all')) {
+    if (all) {
       ok = keys.every(function(key){
         return ~actual.indexOf(key);
       });
@@ -1016,10 +1030,10 @@ module.exports = function (chai, _) {
         return _.inspect(key);
       });
       var last = keys.pop();
-      if (flag(this, 'all')) {
+      if (all) {
         str = keys.join(', ') + ', and ' + last;
       }
-      if (flag(this, 'any')) {
+      if (any) {
         str = keys.join(', ') + ', or ' + last;
       }
     } else {