diff --git a/development_server.js b/development_server.js
index be608cac0..694b59948 100644
--- a/development_server.js
+++ b/development_server.js
@@ -2,6 +2,7 @@
 
 var fs = require('fs');
 var rollup = require('rollup');
+var includePaths = require('rollup-plugin-includepaths');
 var nodeResolve = require('rollup-plugin-node-resolve');
 var commonjs = require('rollup-plugin-commonjs');
 var json = require('rollup-plugin-json');
@@ -50,8 +51,15 @@ function build() {
     rollup.rollup({
         entry: './modules/id.js',
         plugins: [
+            includePaths({
+                paths: [
+                    'node_modules/d3/node_modules'  // for npm 2
+                ]
+            }),
             nodeResolve({
-                jsnext: true, main: true, browser: false
+                module: true,
+                main: true,
+                browser: false
             }),
             commonjs(),
             json()
diff --git a/package.json b/package.json
index e7fa75d28..9d8aac564 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "request": "^2.81.0",
     "rollup": "0.45.2",
     "rollup-plugin-commonjs": "8.2.1",
+    "rollup-plugin-includepaths": "0.2.2",
     "rollup-plugin-json": "2.2.0",
     "rollup-plugin-node-resolve": "3.0.0",
     "shelljs": "^0.7.5",