Merge branch 'master' of https://github.com/rollup/rollup

package.json

@@ -44,7 +44,7 @@
     "codecov.io": "^0.1.6",
     "console-group": "^0.1.2",
     "es6-promise": "^3.0.2",
-    "eslint": "^1.1.0",
+    "eslint": "^1.7.1",
     "estree-walker": "^0.1.3",
     "gobble": "^0.10.1",
     "gobble-babel": "^5.5.8",
@@ -62,7 +62,7 @@
     "chalk": "^1.1.1",
     "minimist": "^1.1.1",
     "source-map-support": "^0.3.1",
-    "sourcemap-codec": "^1.0.0",
+    "sourcemap-codec": "^1.1.0",
     "vlq": "^0.2.1"
   },
   "files": [