diff --git a/gulpfile.js b/gulpfile.js
index adcd12b5295..a3282560203 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,6 +1,6 @@
 var gulp = require('gulp'),
     tslint = require('gulp-tslint'),
-    tsd = require('gulp-tsd'),
+    typings = require('gulp-typings'),
     shell = require('gulp-shell'),
     mocha = require('gulp-mocha'),
     soften = require('gulp-soften'),
@@ -11,12 +11,10 @@ var paths = {
     tests_ts: "test/**/*.ts"
 };
 
-gulp.task('tsd', function (callback) {
+gulp.task('typings', function () {
     // reinstall typescript definitions
-    return gulp.src('./gulp_tsd.json').pipe(tsd({
-        command: 'reinstall',
-        config: './tsd.json'
-    }, callback));
+    return gulp.src('./typings.json')
+               .pipe(typings());
 });
 
 gulp.task('fix-whitespace', function() {
@@ -42,5 +40,5 @@ gulp.task('compile', shell.task([
   'node ./node_modules/vscode/bin/compile -p ./',
 ]));
 
-gulp.task('init', ['tsd']);
+gulp.task('init', ['typings']);
 gulp.task('default', ['tslint', 'compile']);
diff --git a/package.json b/package.json
index 7f9b1b5d79d..6141128af38 100644
--- a/package.json
+++ b/package.json
@@ -9,14 +9,14 @@
     "color": "#a5c9a2",
     "theme": "light"
   },
-  "license" : "MIT",
+  "license": "MIT",
   "keywords": [
     "vim",
     "vi",
     "vscodevim",
     "vsc-vim"
   ],
- "repository": {
+  "repository": {
     "type": "git",
     "url": "https://github.com/VSCodeVim/Vim.git"
   },
@@ -149,15 +149,15 @@
   "devDependencies": {
     "gulp": "^3.9.0",
     "gulp-mocha": "^2.2.0",
-    "gulp-soften": "^0.0.1",
     "gulp-shell": "^0.5.1",
-    "gulp-tsd": "^0.0.4",
-    "gulp-tslint": "^3.6.0",
+    "gulp-soften": "^0.0.1",
     "gulp-trimlines": "^1.0.0",
+    "gulp-tslint": "^3.6.0",
     "gulp-typescript": "^2.9.2",
-    "tsd": "^0.6.5",
+    "gulp-typings": "^1.1.0",
     "tslint": "^3.2.1",
     "typescript": "^1.6.2",
+    "typings": "^0.6.8",
     "vscode": "0.10.x"
   },
   "dependencies": {
diff --git a/src/action/deleteAction.ts b/src/action/deleteAction.ts
index da943d5efc4..50e947cca3f 100644
--- a/src/action/deleteAction.ts
+++ b/src/action/deleteAction.ts
@@ -12,7 +12,7 @@ export class DeleteAction {
         let isEOL = motion.position.isLineEnd();
 
         await TextEditor.delete(range);
-        
+
         if (isEOL) {
             return motion.left().move();
         } else {
diff --git a/tsconfig.json b/tsconfig.json
index 12788d6bdac..1b59e1eff04 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,6 +7,8 @@
 		"sourceMap": true
 	},
 	"exclude": [
-		"node_modules"
+        "node_modules",
+        "typings/browser.d.ts",
+        "typings/browser"
 	]
 }
\ No newline at end of file
diff --git a/tsd.json b/tsd.json
deleted file mode 100644
index 48d4c3eafa8..00000000000
--- a/tsd.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "version": "v4",
-  "repo": "borisyankov/DefinitelyTyped",
-  "ref": "master",
-  "path": "typings",
-  "bundle": "typings/tsd.d.ts",
-  "installed": {
-    "lodash/lodash.d.ts": {
-      "commit": "36c6ce86fb64bafb28ec95dc78c6b98228b45c8d"
-    }
-  }
-}
diff --git a/typings.json b/typings.json
new file mode 100644
index 00000000000..92f2212113d
--- /dev/null
+++ b/typings.json
@@ -0,0 +1,6 @@
+{
+  "name": "vim",
+  "ambientDependencies": {
+    "lodash": "github:DefinitelyTyped/DefinitelyTyped/lodash/lodash.d.ts#36c6ce86fb64bafb28ec95dc78c6b98228b45c8d"
+  }
+}