Merged from upstream

.travis.yml

@@ -1,10 +1,9 @@
 language: node_js
 sudo: false
 node_js:
-  - "0.10"
-  - "0.12"
-  - "iojs"
   - "4"
+  - "5"
+  - "6"
 notifications:
    email: false
 after_success:

docs/rules/README.md

@@ -1,6 +1,6 @@
 # Rules
 
-* [no-exclusive-tests](no-exclusive-tests.md) - disallow exclusive mocha tests (fixable)
+* [no-exclusive-tests](no-exclusive-tests.md) - disallow exclusive mocha tests
 * [no-skipped-tests](no-skipped-tests.md) - disallow skipped mocha tests (fixable)
 * [no-pending-tests](no-pending-tests.md) - disallow pending/unimplemented mocha tests
 * [handle-done-callback](handle-done-callback.md) - enforces handling of callbacks for async tests

index.js

@@ -10,5 +10,12 @@ module.exports = {
         'no-global-tests': require('./lib/rules/no-global-tests'),
         'valid-test-description': require('./lib/rules/valid-test-description'),
         'valid-suite-description': require('./lib/rules/valid-suite-description')
+    },
+    configs: {
+        recommended: {
+            rules: {
+                'mocha/no-exclusive-tests': 2
+            }
+        }
     }
 };

package.json

@@ -19,11 +19,11 @@
         "pr-log": "^1.3.0",
         "istanbul": "^0.4.2",
         "mocha": "^2.4.5",
-        "eslint": "^2.0.0",
+        "eslint": "^3.0.0",
         "coveralls": "^2.11.6"
     },
     "peerDependencies": {
-        "eslint": "^2.0.0"
+        "eslint": "^2.0.0 || ^3.0.0"
     },
     "repository": {
         "type": "git",