diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
index ee891aa70e..58a231c4bb 100644
--- a/core/vendor/.gitignore
+++ b/core/vendor/.gitignore
@@ -125,12 +125,14 @@ backbone/backbone-min*
 
 # davclient.js
 davclient.js/**
-!davclient.js/lib/*
+!davclient.js/lib
 !davclient.js/LICENSE
 
 # es6-promise
 es6-promise/**
 !es6-promise/LICENSE
+!es6-promise/dist
+es6-promise/dist/*
 !es6-promise/dist/es6-promise.js
 
 # base64
diff --git a/core/vendor/es6-promise/.bower.json b/core/vendor/es6-promise/.bower.json
deleted file mode 100644
index f8c28b04e5..0000000000
--- a/core/vendor/es6-promise/.bower.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "name": "es6-promise",
-  "namespace": "Promise",
-  "version": "2.3.0",
-  "description": "A polyfill for ES6-style Promises, tracking rsvp",
-  "authors": [
-    "Stefan Penner <stefan.penner@gmail.com>"
-  ],
-  "main": "dist/es6-promise.js",
-  "keywords": [
-    "promise"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/jakearchibald/ES6-Promises.git"
-  },
-  "bugs": {
-    "url": "https://github.com/jakearchibald/ES6-Promises/issues"
-  },
-  "license": "MIT",
-  "ignore": [
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests",
-    "vendor",
-    "tasks"
-  ],
-  "homepage": "https://github.com/jakearchibald/es6-promise",
-  "_release": "2.3.0",
-  "_resolution": {
-    "type": "version",
-    "tag": "2.3.0",
-    "commit": "fcbab11a1a981eb2290bfff89017cb764335a2a5"
-  },
-  "_source": "https://github.com/jakearchibald/es6-promise.git",
-  "_target": "~2.3.0",
-  "_originalSource": "https://github.com/jakearchibald/es6-promise.git",
-  "_direct": true
-}
\ No newline at end of file
diff --git a/core/vendor/es6-promise/.npmignore b/core/vendor/es6-promise/.npmignore
deleted file mode 100644
index 7a758111e9..0000000000
--- a/core/vendor/es6-promise/.npmignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/node_modules/
-/tmp
-/tasks
-/test
-/vendor
-/.jshintrc
-/.npmignore
-/.travis.yml
-/Gruntfile.js
-/component.json
-/index.html
diff --git a/core/vendor/es6-promise/.release.json b/core/vendor/es6-promise/.release.json
deleted file mode 100644
index dee8cbc5d9..0000000000
--- a/core/vendor/es6-promise/.release.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "non-interactive": true,
-  "dry-run": false,
-  "verbose": false,
-  "force": false,
-  "pkgFiles": ["package.json", "bower.json"],
-  "increment": "patch",
-  "commitMessage": "Release %s",
-  "tagName": "%s",
-  "tagAnnotation": "Release %s",
-  "buildCommand": "npm run-script build-all",
-  "distRepo": "git@github.com:components/rsvp.js.git",
-  "distStageDir": "tmp/stage",
-  "distBase": "dist",
-  "distFiles": ["**/*", "../package.json", "../bower.json"],
-  "publish": false
-}
diff --git a/core/vendor/es6-promise/.spmignore b/core/vendor/es6-promise/.spmignore
deleted file mode 100644
index 7a758111e9..0000000000
--- a/core/vendor/es6-promise/.spmignore
+++ /dev/null
@@ -1,11 +0,0 @@
-/node_modules/
-/tmp
-/tasks
-/test
-/vendor
-/.jshintrc
-/.npmignore
-/.travis.yml
-/Gruntfile.js
-/component.json
-/index.html