diff --git a/README.md b/README.md
index 17e2a803..ceeca25e 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ This repository contains all of the necessary node modules for gaia. By placing
 
 1. Create a fork of this repository.
 2. Update package.json.
-3. Update the node_modules folder by running: ```npm cache clean && npm install --ignore-scripts```
+3. Update the node_modules folder by running: ```npm cache clean && npm install --ignore-scripts --no-bin-links```
 4. Commit *everything*.
 5. Submit a pull request, tracked against a bug at: http://bugzilla.mozilla.org.  You don't need a special bug just for this change; you can reuse whatever bug is trying to fix the underlying problem.
 
diff --git a/node_modules/.bin/_mocha b/node_modules/.bin/_mocha
deleted file mode 120000
index f2a54ffd..00000000
--- a/node_modules/.bin/_mocha
+++ /dev/null
@@ -1 +0,0 @@
-../mocha/bin/_mocha
\ No newline at end of file
diff --git a/node_modules/.bin/apply-manifest b/node_modules/.bin/apply-manifest
deleted file mode 120000
index ea21a53c..00000000
--- a/node_modules/.bin/apply-manifest
+++ /dev/null
@@ -1 +0,0 @@
-../marionette-js-runner/bin/apply-manifest
\ No newline at end of file
diff --git a/node_modules/.bin/ecstatic b/node_modules/.bin/ecstatic
deleted file mode 120000
index 5a8a58af..00000000
--- a/node_modules/.bin/ecstatic
+++ /dev/null
@@ -1 +0,0 @@
-../ecstatic/lib/ecstatic.js
\ No newline at end of file
diff --git a/node_modules/.bin/esparse b/node_modules/.bin/esparse
deleted file mode 120000
index 7423b18b..00000000
--- a/node_modules/.bin/esparse
+++ /dev/null
@@ -1 +0,0 @@
-../esprima/bin/esparse.js
\ No newline at end of file
diff --git a/node_modules/.bin/esvalidate b/node_modules/.bin/esvalidate
deleted file mode 120000
index 16069eff..00000000
--- a/node_modules/.bin/esvalidate
+++ /dev/null
@@ -1 +0,0 @@
-../esprima/bin/esvalidate.js
\ No newline at end of file
diff --git a/node_modules/.bin/grunt-jsdoc b/node_modules/.bin/grunt-jsdoc
deleted file mode 120000
index 3df1d1f3..00000000
--- a/node_modules/.bin/grunt-jsdoc
+++ /dev/null
@@ -1 +0,0 @@
-../grunt-jsdoc/bin/grunt-jsdoc
\ No newline at end of file
diff --git a/node_modules/.bin/istanbul b/node_modules/.bin/istanbul
deleted file mode 120000
index c129fe51..00000000
--- a/node_modules/.bin/istanbul
+++ /dev/null
@@ -1 +0,0 @@
-../istanbul/lib/cli.js
\ No newline at end of file
diff --git a/node_modules/.bin/js-test-agent b/node_modules/.bin/js-test-agent
deleted file mode 120000
index 301e6f54..00000000
--- a/node_modules/.bin/js-test-agent
+++ /dev/null
@@ -1 +0,0 @@
-../test-agent/bin/js-test-agent
\ No newline at end of file
diff --git a/node_modules/.bin/js-yaml b/node_modules/.bin/js-yaml
deleted file mode 120000
index 9dbd010d..00000000
--- a/node_modules/.bin/js-yaml
+++ /dev/null
@@ -1 +0,0 @@
-../js-yaml/bin/js-yaml.js
\ No newline at end of file
diff --git a/node_modules/.bin/jshint b/node_modules/.bin/jshint
deleted file mode 120000
index 1b5b30ca..00000000
--- a/node_modules/.bin/jshint
+++ /dev/null
@@ -1 +0,0 @@
-../jshint/bin/jshint
\ No newline at end of file
diff --git a/node_modules/.bin/marionette-mocha b/node_modules/.bin/marionette-mocha
deleted file mode 120000
index 38ef1b59..00000000
--- a/node_modules/.bin/marionette-mocha
+++ /dev/null
@@ -1 +0,0 @@
-../marionette-js-runner/bin/marionette-mocha
\ No newline at end of file
diff --git a/node_modules/.bin/mocha b/node_modules/.bin/mocha
deleted file mode 120000
index 43c668d9..00000000
--- a/node_modules/.bin/mocha
+++ /dev/null
@@ -1 +0,0 @@
-../mocha/bin/mocha
\ No newline at end of file
diff --git a/node_modules/.bin/mocha-parallel b/node_modules/.bin/mocha-parallel
deleted file mode 120000
index 8cde2f4d..00000000
--- a/node_modules/.bin/mocha-parallel
+++ /dev/null
@@ -1 +0,0 @@
-../mocha-parallel/mocha-parallel
\ No newline at end of file
diff --git a/node_modules/.bin/mozilla-download b/node_modules/.bin/mozilla-download
deleted file mode 120000
index 6df2de7a..00000000
--- a/node_modules/.bin/mozilla-download
+++ /dev/null
@@ -1 +0,0 @@
-../mozilla-download/bin/mozilla-download
\ No newline at end of file
diff --git a/node_modules/.bin/report-latency b/node_modules/.bin/report-latency
deleted file mode 120000
index 46497f57..00000000
--- a/node_modules/.bin/report-latency
+++ /dev/null
@@ -1 +0,0 @@
-../restify/bin/report-latency
\ No newline at end of file
diff --git a/node_modules/.bin/rimraf b/node_modules/.bin/rimraf
deleted file mode 120000
index 4cd49a49..00000000
--- a/node_modules/.bin/rimraf
+++ /dev/null
@@ -1 +0,0 @@
-../rimraf/bin.js
\ No newline at end of file
diff --git a/node_modules/.bin/static b/node_modules/.bin/static
deleted file mode 120000
index 66f6f8a9..00000000
--- a/node_modules/.bin/static
+++ /dev/null
@@ -1 +0,0 @@
-../node-static/bin/cli.js
\ No newline at end of file
diff --git a/node_modules/.bin/uuid b/node_modules/.bin/uuid
deleted file mode 120000
index 80eb14aa..00000000
--- a/node_modules/.bin/uuid
+++ /dev/null
@@ -1 +0,0 @@
-../node-uuid/bin/uuid
\ No newline at end of file
diff --git a/node_modules/download/node_modules/decompress/node_modules/tar/node_modules/fstream/node_modules/.bin/mkdirp b/node_modules/download/node_modules/decompress/node_modules/tar/node_modules/fstream/node_modules/.bin/mkdirp
deleted file mode 120000
index 017896ce..00000000
--- a/node_modules/download/node_modules/decompress/node_modules/tar/node_modules/fstream/node_modules/.bin/mkdirp
+++ /dev/null
@@ -1 +0,0 @@
-../mkdirp/bin/cmd.js
\ No newline at end of file
diff --git a/node_modules/download/node_modules/request/node_modules/.bin/uuid b/node_modules/download/node_modules/request/node_modules/.bin/uuid
deleted file mode 120000
index 80eb14aa..00000000
--- a/node_modules/download/node_modules/request/node_modules/.bin/uuid
+++ /dev/null
@@ -1 +0,0 @@
-../node-uuid/bin/uuid
\ No newline at end of file
diff --git a/node_modules/fs-extra/node_modules/.bin/rimraf b/node_modules/fs-extra/node_modules/.bin/rimraf
deleted file mode 120000
index 4cd49a49..00000000
--- a/node_modules/fs-extra/node_modules/.bin/rimraf
+++ /dev/null
@@ -1 +0,0 @@
-../rimraf/bin.js
\ No newline at end of file
diff --git a/node_modules/gaia-raptor/node_modules/mozdevice/node_modules/temp/node_modules/.bin/rimraf b/node_modules/gaia-raptor/node_modules/mozdevice/node_modules/temp/node_modules/.bin/rimraf
deleted file mode 120000
index 4cd49a49..00000000
--- a/node_modules/gaia-raptor/node_modules/mozdevice/node_modules/temp/node_modules/.bin/rimraf
+++ /dev/null
@@ -1 +0,0 @@
-../rimraf/bin.js
\ No newline at end of file
diff --git a/node_modules/gaia-raptor/node_modules/mozdevice/node_modules/unzip/node_modules/fstream/node_modules/.bin/mkdirp b/node_modules/gaia-raptor/node_modules/mozdevice/node_modules/unzip/node_modules/fstream/node_modules/.bin/mkdirp
deleted file mode 120000
index 017896ce..00000000
--- a/node_modules/gaia-raptor/node_modules/mozdevice/node_modules/unzip/node_modules/fstream/node_modules/.bin/mkdirp
+++ /dev/null
@@ -1 +0,0 @@
-../mkdirp/bin/cmd.js
\ No newline at end of file
diff --git a/node_modules/grunt-jsdoc/node_modules/.bin/jsdoc b/node_modules/grunt-jsdoc/node_modules/.bin/jsdoc
deleted file mode 120000
index 384cdd18..00000000
--- a/node_modules/grunt-jsdoc/node_modules/.bin/jsdoc
+++ /dev/null
@@ -1 +0,0 @@
-../jsdoc/nodejs/bin/jsdoc
\ No newline at end of file
diff --git a/node_modules/grunt-jsdoc/node_modules/jsdoc/node_modules/.bin/jshint b/node_modules/grunt-jsdoc/node_modules/jsdoc/node_modules/.bin/jshint
deleted file mode 120000
index fca005fe..00000000
--- a/node_modules/grunt-jsdoc/node_modules/jsdoc/node_modules/.bin/jshint
+++ /dev/null
@@ -1 +0,0 @@
-../jshint/bin/hint
\ No newline at end of file
diff --git a/node_modules/grunt-jsdoc/node_modules/jsdoc/node_modules/.bin/marked b/node_modules/grunt-jsdoc/node_modules/jsdoc/node_modules/.bin/marked
deleted file mode 120000
index a8d872e9..00000000
--- a/node_modules/grunt-jsdoc/node_modules/jsdoc/node_modules/.bin/marked
+++ /dev/null
@@ -1 +0,0 @@
-../marked/bin/marked
\ No newline at end of file
diff --git a/node_modules/grunt/node_modules/.bin/cake b/node_modules/grunt/node_modules/.bin/cake
deleted file mode 120000
index d95f32af..00000000
--- a/node_modules/grunt/node_modules/.bin/cake
+++ /dev/null
@@ -1 +0,0 @@
-../coffee-script/bin/cake
\ No newline at end of file
diff --git a/node_modules/grunt/node_modules/.bin/coffee b/node_modules/grunt/node_modules/.bin/coffee
deleted file mode 120000
index b57f275d..00000000
--- a/node_modules/grunt/node_modules/.bin/coffee
+++ /dev/null
@@ -1 +0,0 @@
-../coffee-script/bin/coffee
\ No newline at end of file
diff --git a/node_modules/grunt/node_modules/.bin/js-yaml b/node_modules/grunt/node_modules/.bin/js-yaml
deleted file mode 120000
index 9dbd010d..00000000
--- a/node_modules/grunt/node_modules/.bin/js-yaml
+++ /dev/null
@@ -1 +0,0 @@
-../js-yaml/bin/js-yaml.js
\ No newline at end of file
diff --git a/node_modules/grunt/node_modules/.bin/nopt b/node_modules/grunt/node_modules/.bin/nopt
deleted file mode 120000
index 6b6566ea..00000000
--- a/node_modules/grunt/node_modules/.bin/nopt
+++ /dev/null
@@ -1 +0,0 @@
-../nopt/bin/nopt.js
\ No newline at end of file
diff --git a/node_modules/grunt/node_modules/.bin/which b/node_modules/grunt/node_modules/.bin/which
deleted file mode 120000
index f62471c8..00000000
--- a/node_modules/grunt/node_modules/.bin/which
+++ /dev/null
@@ -1 +0,0 @@
-../which/bin/which
\ No newline at end of file
diff --git a/node_modules/grunt/node_modules/js-yaml/node_modules/.bin/esparse b/node_modules/grunt/node_modules/js-yaml/node_modules/.bin/esparse
deleted file mode 120000
index 7423b18b..00000000
--- a/node_modules/grunt/node_modules/js-yaml/node_modules/.bin/esparse
+++ /dev/null
@@ -1 +0,0 @@
-../esprima/bin/esparse.js
\ No newline at end of file
diff --git a/node_modules/grunt/node_modules/js-yaml/node_modules/.bin/esvalidate b/node_modules/grunt/node_modules/js-yaml/node_modules/.bin/esvalidate
deleted file mode 120000
index 16069eff..00000000
--- a/node_modules/grunt/node_modules/js-yaml/node_modules/.bin/esvalidate
+++ /dev/null
@@ -1 +0,0 @@
-../esprima/bin/esvalidate.js
\ No newline at end of file
diff --git a/node_modules/istanbul/node_modules/.bin/escodegen b/node_modules/istanbul/node_modules/.bin/escodegen
deleted file mode 120000
index 01a7c325..00000000
--- a/node_modules/istanbul/node_modules/.bin/escodegen
+++ /dev/null
@@ -1 +0,0 @@
-../escodegen/bin/escodegen.js
\ No newline at end of file
diff --git a/node_modules/istanbul/node_modules/.bin/esgenerate b/node_modules/istanbul/node_modules/.bin/esgenerate
deleted file mode 120000
index 7d0293e6..00000000
--- a/node_modules/istanbul/node_modules/.bin/esgenerate
+++ /dev/null
@@ -1 +0,0 @@
-../escodegen/bin/esgenerate.js
\ No newline at end of file
diff --git a/node_modules/istanbul/node_modules/.bin/esparse b/node_modules/istanbul/node_modules/.bin/esparse
deleted file mode 120000
index 7423b18b..00000000
--- a/node_modules/istanbul/node_modules/.bin/esparse
+++ /dev/null
@@ -1 +0,0 @@
-../esprima/bin/esparse.js
\ No newline at end of file
diff --git a/node_modules/istanbul/node_modules/.bin/esvalidate b/node_modules/istanbul/node_modules/.bin/esvalidate
deleted file mode 120000
index 16069eff..00000000
--- a/node_modules/istanbul/node_modules/.bin/esvalidate
+++ /dev/null
@@ -1 +0,0 @@
-../esprima/bin/esvalidate.js
\ No newline at end of file
diff --git a/node_modules/istanbul/node_modules/.bin/handlebars b/node_modules/istanbul/node_modules/.bin/handlebars
deleted file mode 120000
index fb7d090f..00000000
--- a/node_modules/istanbul/node_modules/.bin/handlebars
+++ /dev/null
@@ -1 +0,0 @@
-../handlebars/bin/handlebars
\ No newline at end of file
diff --git a/node_modules/istanbul/node_modules/.bin/mkdirp b/node_modules/istanbul/node_modules/.bin/mkdirp
deleted file mode 120000
index 017896ce..00000000
--- a/node_modules/istanbul/node_modules/.bin/mkdirp
+++ /dev/null
@@ -1 +0,0 @@
-../mkdirp/bin/cmd.js
\ No newline at end of file
diff --git a/node_modules/istanbul/node_modules/.bin/nopt b/node_modules/istanbul/node_modules/.bin/nopt
deleted file mode 120000
index 6b6566ea..00000000
--- a/node_modules/istanbul/node_modules/.bin/nopt
+++ /dev/null
@@ -1 +0,0 @@
-../nopt/bin/nopt.js
\ No newline at end of file
diff --git a/node_modules/istanbul/node_modules/.bin/which b/node_modules/istanbul/node_modules/.bin/which
deleted file mode 120000
index f62471c8..00000000
--- a/node_modules/istanbul/node_modules/.bin/which
+++ /dev/null
@@ -1 +0,0 @@
-../which/bin/which
\ No newline at end of file
diff --git a/node_modules/istanbul/node_modules/escodegen/node_modules/.bin/esparse b/node_modules/istanbul/node_modules/escodegen/node_modules/.bin/esparse
deleted file mode 120000
index 7423b18b..00000000
--- a/node_modules/istanbul/node_modules/escodegen/node_modules/.bin/esparse
+++ /dev/null
@@ -1 +0,0 @@
-../esprima/bin/esparse.js
\ No newline at end of file
diff --git a/node_modules/istanbul/node_modules/escodegen/node_modules/.bin/esvalidate b/node_modules/istanbul/node_modules/escodegen/node_modules/.bin/esvalidate
deleted file mode 120000
index 16069eff..00000000
--- a/node_modules/istanbul/node_modules/escodegen/node_modules/.bin/esvalidate
+++ /dev/null
@@ -1 +0,0 @@
-../esprima/bin/esvalidate.js
\ No newline at end of file
diff --git a/node_modules/istanbul/node_modules/handlebars/node_modules/.bin/uglifyjs b/node_modules/istanbul/node_modules/handlebars/node_modules/.bin/uglifyjs
deleted file mode 120000
index fef3468b..00000000
--- a/node_modules/istanbul/node_modules/handlebars/node_modules/.bin/uglifyjs
+++ /dev/null
@@ -1 +0,0 @@
-../uglify-js/bin/uglifyjs
\ No newline at end of file
diff --git a/node_modules/js-yaml/node_modules/.bin/esparse b/node_modules/js-yaml/node_modules/.bin/esparse
deleted file mode 120000
index 7423b18b..00000000
--- a/node_modules/js-yaml/node_modules/.bin/esparse
+++ /dev/null
@@ -1 +0,0 @@
-../esprima/bin/esparse.js
\ No newline at end of file
diff --git a/node_modules/js-yaml/node_modules/.bin/esvalidate b/node_modules/js-yaml/node_modules/.bin/esvalidate
deleted file mode 120000
index 16069eff..00000000
--- a/node_modules/js-yaml/node_modules/.bin/esvalidate
+++ /dev/null
@@ -1 +0,0 @@
-../esprima/bin/esvalidate.js
\ No newline at end of file
diff --git a/node_modules/jshint/node_modules/.bin/shjs b/node_modules/jshint/node_modules/.bin/shjs
deleted file mode 120000
index a0449975..00000000
--- a/node_modules/jshint/node_modules/.bin/shjs
+++ /dev/null
@@ -1 +0,0 @@
-../shelljs/bin/shjs
\ No newline at end of file
diff --git a/node_modules/jshint/node_modules/.bin/strip-json-comments b/node_modules/jshint/node_modules/.bin/strip-json-comments
deleted file mode 120000
index 63d549f9..00000000
--- a/node_modules/jshint/node_modules/.bin/strip-json-comments
+++ /dev/null
@@ -1 +0,0 @@
-../strip-json-comments/cli.js
\ No newline at end of file
diff --git a/node_modules/marionette-js-runner/node_modules/.bin/indent-string b/node_modules/marionette-js-runner/node_modules/.bin/indent-string
deleted file mode 120000
index 6767b063..00000000
--- a/node_modules/marionette-js-runner/node_modules/.bin/indent-string
+++ /dev/null
@@ -1 +0,0 @@
-../indent-string/cli.js
\ No newline at end of file
diff --git a/node_modules/marionette-js-runner/node_modules/.bin/mkdirp b/node_modules/marionette-js-runner/node_modules/.bin/mkdirp
deleted file mode 120000
index 017896ce..00000000
--- a/node_modules/marionette-js-runner/node_modules/.bin/mkdirp
+++ /dev/null
@@ -1 +0,0 @@
-../mkdirp/bin/cmd.js
\ No newline at end of file
diff --git a/node_modules/marionette-js-runner/node_modules/indent-string/node_modules/.bin/repeating b/node_modules/marionette-js-runner/node_modules/indent-string/node_modules/.bin/repeating
deleted file mode 120000
index cdedec32..00000000
--- a/node_modules/marionette-js-runner/node_modules/indent-string/node_modules/.bin/repeating
+++ /dev/null
@@ -1 +0,0 @@
-../repeating/cli.js
\ No newline at end of file
diff --git a/node_modules/marionette-js-runner/node_modules/marionette-profile-builder/node_modules/mozilla-profile-builder/node_modules/fs-extra/node_modules/.bin/ncp b/node_modules/marionette-js-runner/node_modules/marionette-profile-builder/node_modules/mozilla-profile-builder/node_modules/fs-extra/node_modules/.bin/ncp
deleted file mode 120000
index 1c026480..00000000
--- a/node_modules/marionette-js-runner/node_modules/marionette-profile-builder/node_modules/mozilla-profile-builder/node_modules/fs-extra/node_modules/.bin/ncp
+++ /dev/null
@@ -1 +0,0 @@
-../ncp/bin/ncp
\ No newline at end of file
diff --git a/node_modules/marionette-profile-builder/node_modules/mozilla-profile-builder/node_modules/fs-extra/node_modules/.bin/ncp b/node_modules/marionette-profile-builder/node_modules/mozilla-profile-builder/node_modules/fs-extra/node_modules/.bin/ncp
deleted file mode 120000
index 1c026480..00000000
--- a/node_modules/marionette-profile-builder/node_modules/mozilla-profile-builder/node_modules/fs-extra/node_modules/.bin/ncp
+++ /dev/null
@@ -1 +0,0 @@
-../ncp/bin/ncp
\ No newline at end of file
diff --git a/node_modules/mocha/node_modules/.bin/jade b/node_modules/mocha/node_modules/.bin/jade
deleted file mode 120000
index 571fae73..00000000
--- a/node_modules/mocha/node_modules/.bin/jade
+++ /dev/null
@@ -1 +0,0 @@
-../jade/bin/jade
\ No newline at end of file
diff --git a/node_modules/mozilla-download/node_modules/.bin/mozilla-get-url b/node_modules/mozilla-download/node_modules/.bin/mozilla-get-url
deleted file mode 120000
index ff879fc4..00000000
--- a/node_modules/mozilla-download/node_modules/.bin/mozilla-get-url
+++ /dev/null
@@ -1 +0,0 @@
-../mozilla-get-url/bin/mozilla-get-url
\ No newline at end of file
diff --git a/node_modules/mozilla-download/node_modules/.bin/ncp b/node_modules/mozilla-download/node_modules/.bin/ncp
deleted file mode 120000
index 1c026480..00000000
--- a/node_modules/mozilla-download/node_modules/.bin/ncp
+++ /dev/null
@@ -1 +0,0 @@
-../ncp/bin/ncp
\ No newline at end of file
diff --git a/node_modules/request/node_modules/.bin/uuid b/node_modules/request/node_modules/.bin/uuid
deleted file mode 120000
index 80eb14aa..00000000
--- a/node_modules/request/node_modules/.bin/uuid
+++ /dev/null
@@ -1 +0,0 @@
-../node-uuid/bin/uuid
\ No newline at end of file
diff --git a/node_modules/restify/node_modules/.bin/bunyan b/node_modules/restify/node_modules/.bin/bunyan
deleted file mode 120000
index 3555ac7d..00000000
--- a/node_modules/restify/node_modules/.bin/bunyan
+++ /dev/null
@@ -1 +0,0 @@
-../bunyan/bin/bunyan
\ No newline at end of file
diff --git a/node_modules/restify/node_modules/.bin/semver b/node_modules/restify/node_modules/.bin/semver
deleted file mode 120000
index 317eb293..00000000
--- a/node_modules/restify/node_modules/.bin/semver
+++ /dev/null
@@ -1 +0,0 @@
-../semver/bin/semver
\ No newline at end of file
diff --git a/node_modules/test-agent/node_modules/.bin/wscat b/node_modules/test-agent/node_modules/.bin/wscat
deleted file mode 120000
index 06c3b744..00000000
--- a/node_modules/test-agent/node_modules/.bin/wscat
+++ /dev/null
@@ -1 +0,0 @@
-../ws/bin/wscat
\ No newline at end of file
diff --git a/node_modules/test-agent/node_modules/websocket.io/node_modules/.bin/wscat b/node_modules/test-agent/node_modules/websocket.io/node_modules/.bin/wscat
deleted file mode 120000
index 06c3b744..00000000
--- a/node_modules/test-agent/node_modules/websocket.io/node_modules/.bin/wscat
+++ /dev/null
@@ -1 +0,0 @@
-../ws/bin/wscat
\ No newline at end of file