Merge remote-tracking branch 'upstream/master'

Author: jklein

npm/package.json

@@ -3,7 +3,6 @@
     "version": "@VERSION@",
     "description": "CSSLint",
     "author": "Nicholas C. Zakas",
-    "os": ["darwin", "linux", "win32"],
     "contributors": [
         "Nicole Sullivan"
     ],
@@ -27,4 +26,4 @@
         "type":"git",
         "url":"http://github.com/stubbornella/csslint.git"
     }
-}
+}