Merge 3a7042d into d54e465

.gitignore

@@ -8,3 +8,4 @@ coverage/
 defaultlocales
 localestowrite
 localesmakeplural
+.vscode

.jshintrc

@@ -34,9 +34,6 @@
   // Prohibit use of a variable before it is defined.
   "latedef": false,
 
-  // Enforce line length to 100 characters
-  "maxlen": 100,
-
   // Require capitalized names for constructor functions.
   "newcap": true,
 

.travis.yml

@@ -1,11 +1,12 @@
 language: node_js
 node_js:
   - 0.10
-  - 0.11
   - 0.12
+  - iojs
   - 4
   - 5
-  - iojs
+  - 6
+  - 7
 branches:
   only:
     - master

README.md

@@ -307,6 +307,10 @@ and add it's extra attributes and methods, like so:
 
 Now each _local_ object (ie. res.locals) is setup with _it's own "private"_ locale and methods to get the appropriate translation from the _global_ catalog.
 
+### i18n.disableReload()
+
+Stopps watching for outside changes on the locale files if ```autoReload: true```.
+
 ### i18n.__()
 
 Translates a single phrase and adds it to locales if unknown. Returns translated parsed and substituted string.

appveyor.yml

@@ -2,9 +2,11 @@ environment:
   matrix:
     - nodejs_version: "0.10"
     - nodejs_version: "0.12"
+    - nodejs_version: "iojs"
     - nodejs_version: "4"
     - nodejs_version: "5"
-    - nodejs_version: "iojs"
+    - nodejs_version: "6"
+    - nodejs_version: "7"
 branches:
   only:
     - master