From 44c3a8bf0498f80bae5414494b884571389abd0f Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 3 Aug 2015 09:36:59 -0700
Subject: [PATCH 01/21] username -> user for 'ftp'

---
 ftp/ftp-tests.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ftp/ftp-tests.ts b/ftp/ftp-tests.ts
index 2e37e53f9..57b706182 100644
--- a/ftp/ftp-tests.ts
+++ b/ftp/ftp-tests.ts
@@ -19,8 +19,8 @@ c.connect();
 
 c.connect({
 	host: "127.0.0.1",
-	port: 21,
-	username: "Boo",
+    port: 21,
+    user: "Boo",
 	password: "secret"
 });
 

From 3f6ae4eabec3e6cddd71d0730127603131de2bbb Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 3 Aug 2015 09:44:45 -0700
Subject: [PATCH 02/21] Added 'base' for 'gulp-watch' tests.

---
 gulp/gulp.d.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gulp/gulp.d.ts b/gulp/gulp.d.ts
index d7a0dba57..13c12a811 100644
--- a/gulp/gulp.d.ts
+++ b/gulp/gulp.d.ts
@@ -28,6 +28,13 @@ declare module gulp {
          */
         buffer?: boolean;
 
+        /**
+         * The base path of a glob.
+         *
+         * Default is everything before a glob starts.
+         */
+        base?: string;
+
         /**
          * The current working directory in which to search.
          * Defaults to process.cwd().

From 01ca8013b4e15de9531fe5ba58e5a08e6f7a1529 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 3 Aug 2015 09:49:41 -0700
Subject: [PATCH 03/21] summary -> description for 'microsoft-live-connect'

---
 microsoft-live-connect/microsoft-live-connect-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/microsoft-live-connect/microsoft-live-connect-tests.ts b/microsoft-live-connect/microsoft-live-connect-tests.ts
index e6c1e2ad0..00f2208f0 100644
--- a/microsoft-live-connect/microsoft-live-connect-tests.ts
+++ b/microsoft-live-connect/microsoft-live-connect-tests.ts
@@ -467,7 +467,7 @@ var calendarCollection: Microsoft.Live.IObjectCollection<Microsoft.Live.ICalenda
 
 var newCalendar: Microsoft.Live.INewCalendar = {
     "name": "Summer Events",
-    "summary": "Things we are doing this summer."
+    "description": "Things we are doing this summer."
 };
 
 var newCalendarSub: Microsoft.Live.INewCalendarSubscription = {

From 1c40165c8d3651db1aedf7c186ce065f2fedb96a Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 3 Aug 2015 22:57:10 -0700
Subject: [PATCH 04/21] Use result of 'template' instead of 'settings'
 parameter.

---
 underscore/underscore-tests.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/underscore/underscore-tests.ts b/underscore/underscore-tests.ts
index d530a4334..f469d3bea 100644
--- a/underscore/underscore-tests.ts
+++ b/underscore/underscore-tests.ts
@@ -291,17 +291,18 @@ _.result(object, 'stuff');
 var compiled = _.template("hello: <%= name %>");
 compiled({ name: 'moe' });
 var list2 = "<% _.each(people, function(name) { %> <li><%= name %></li> <% }); %>";
-_.template(list2, { people: ['moe', 'curly', 'larry'] });
+_.template(list2)({ people: ['moe', 'curly', 'larry'] });
 var template = _.template("<b><%- value %></b>");
 template({ value: '<script>' });
 var compiled2 = _.template("<% print('Hello ' + epithet); %>");
 compiled2({ epithet: "stooge" });
+var oldTemplateSettings = _.templateSettings;
 _.templateSettings = {
 	interpolate: /\{\{(.+?)\}\}/g
 };
 var template2 = _.template("Hello {{ name }}!");
 template2({ name: "Mustache" });
-_.template("Using 'with': <%= data.answer %>", { variable: 'data' });
+_.template("Using 'with': <%= data.answer %>", oldTemplateSettings)({ variable: 'data' });
 
 
 _(['test', 'test']).pick(['test2', 'test2']);

From 902d293a344b303a21696f3002aa529641c82af8 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 3 Aug 2015 23:09:59 -0700
Subject: [PATCH 05/21] Singulars for 'moment-node'.

---
 moment/moment-node.d.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/moment/moment-node.d.ts b/moment/moment-node.d.ts
index fd0d59d68..83c14c139 100644
--- a/moment/moment-node.d.ts
+++ b/moment/moment-node.d.ts
@@ -8,27 +8,35 @@ declare module moment {
     interface MomentInput {
 
         years?: number;
+        year?: number;
         y?: number;
 
         months?: number;
+        month?: number;
         M?: number;
 
         weeks?: number;
         w?: number;
 
         days?: number;
+        day?: number;
+        date?: number;
         d?: number;
 
         hours?: number;
+        hour?: number;
         h?: number;
 
         minutes?: number;
+        minute?: number;
         m?: number;
 
         seconds?: number;
+        second?: number;
         s?: number;
 
         milliseconds?: number;
+        millisecond?: number;
         ms?: number;
 
     }

From f07c2de56cc96c2b425cdc05e2958a01f8050bea Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 3 Aug 2015 23:10:32 -0700
Subject: [PATCH 06/21] Remove weeks from 'moment'.

---
 moment/moment-node.d.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/moment/moment-node.d.ts b/moment/moment-node.d.ts
index 83c14c139..c1ac047df 100644
--- a/moment/moment-node.d.ts
+++ b/moment/moment-node.d.ts
@@ -15,9 +15,6 @@ declare module moment {
         month?: number;
         M?: number;
 
-        weeks?: number;
-        w?: number;
-
         days?: number;
         day?: number;
         date?: number;

From e3f6e0504a25909dcbbdd7074351f45345285bba Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 3 Aug 2015 23:12:38 -0700
Subject: [PATCH 07/21] Prevent more people from going insane after forgetting
 that 'month' needs to be differentiated from 'minute'.

---
 moment/moment-node.d.ts | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/moment/moment-node.d.ts b/moment/moment-node.d.ts
index c1ac047df..3728f898f 100644
--- a/moment/moment-node.d.ts
+++ b/moment/moment-node.d.ts
@@ -7,33 +7,55 @@ declare module moment {
 
     interface MomentInput {
 
+        /** Year */
         years?: number;
+        /** Year */
         year?: number;
+        /** Year */
         y?: number;
 
+        /** Month */
         months?: number;
+        /** Month */
         month?: number;
+        /** Month */
         M?: number;
 
+        /** Day/Date */
         days?: number;
+        /** Day/Date */
         day?: number;
+        /** Day/Date */
         date?: number;
+        /** Day/Date */
         d?: number;
 
+        /** Hour */
         hours?: number;
+        /** Hour */
         hour?: number;
+        /** Hour */
         h?: number;
 
+        /** Minute */
         minutes?: number;
+        /** Minute */
         minute?: number;
+        /** Minute */
         m?: number;
 
+        /** Second */
         seconds?: number;
+        /** Second */
         second?: number;
+        /** Second */
         s?: number;
 
+        /** Millisecond */
         milliseconds?: number;
+        /** Millisecond */
         millisecond?: number;
+        /** Millisecond */
         ms?: number;
 
     }

From 4fca492c5b7495e6a752d2bc23dd5a0957dd0cd0 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 3 Aug 2015 23:21:18 -0700
Subject: [PATCH 08/21] 'useStrict' should be allowed in options for overloads
 in 'twix'.

---
 twix/twix.d.ts | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/twix/twix.d.ts b/twix/twix.d.ts
index e82df73be..4c52fbc79 100644
--- a/twix/twix.d.ts
+++ b/twix/twix.d.ts
@@ -9,33 +9,33 @@ declare module moment {
     interface Moment {
         twix(date: Date): Twix;
         twix(date: Date, allDay: boolean): Twix;
-        twix(date: Date, options: TwixFormatOptions): Twix;
-        twix(date: Date, format: string, options: TwixFormatOptions): Twix;
+        twix(date: Date, options: TwixParseAndFormatOptions): Twix;
+        twix(date: Date, format: string, options: TwixParseAndFormatOptions): Twix;
 
         twix(date: Moment): Twix;
         twix(date: Moment, allDay: boolean): Twix;
-        twix(date: Moment, options: TwixFormatOptions): Twix;
-        twix(date: Moment, format: string, options: TwixFormatOptions): Twix;
+        twix(date: Moment, options: TwixParseAndFormatOptions): Twix;
+        twix(date: Moment, format: string, options: TwixParseAndFormatOptions): Twix;
 
         twix(date: MomentInput): Twix;
         twix(date: MomentInput, allDay: boolean): Twix;
-        twix(date: MomentInput, options: TwixFormatOptions): Twix;
-        twix(date: MomentInput, format: string, options: TwixFormatOptions): Twix;
+        twix(date: MomentInput, options: TwixParseAndFormatOptions): Twix;
+        twix(date: MomentInput, format: string, options: TwixParseAndFormatOptions): Twix;
 
         twix(date: number): Twix;
         twix(date: number, allDay: boolean): Twix;
-        twix(date: number, options: TwixFormatOptions): Twix;
-        twix(date: number, format: string, options: TwixFormatOptions): Twix;
+        twix(date: number, options: TwixParseAndFormatOptions): Twix;
+        twix(date: number, format: string, options: TwixParseAndFormatOptions): Twix;
 
         twix(date: number[]): Twix;
         twix(date: number[], allDay: boolean): Twix;
-        twix(date: number[], options: TwixFormatOptions): Twix;
-        twix(date: number[], format: string, options: TwixFormatOptions): Twix;
+        twix(date: number[], options: TwixParseAndFormatOptions): Twix;
+        twix(date: number[], format: string, options: TwixParseAndFormatOptions): Twix;
 
         twix(date: string): Twix;
         twix(date: string, allDay: boolean): Twix;
-        twix(date: string, options: TwixFormatOptions): Twix;
-        twix(date: string, format: string, options: TwixFormatOptions): Twix;
+        twix(date: string, options: TwixParseAndFormatOptions): Twix;
+        twix(date: string, format: string, options: TwixParseAndFormatOptions): Twix;
     }
 
     interface MomentStatic {
@@ -63,6 +63,10 @@ declare module moment {
         lastNightEndsAt?: number;
     }
 
+    interface TwixParseAndFormatOptions extends TwixFormatOptions {
+        parseStrict?: boolean;
+    }
+
     interface TwixSimpleFormatOptions {
         allDay?: string;
         template?: (left: any, right: any) => any;

From 81aef921fa8e74537e2628ddabe4c024e7354a5d Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 3 Aug 2015 23:27:44 -0700
Subject: [PATCH 09/21] Update 'renderOnAddition' to 'renderOnAddRemove' for
 'fabricjs'.

See https://github.com/kangax/fabric.js/pull/783
---
 fabricjs/fabricjs-tests.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fabricjs/fabricjs-tests.ts b/fabricjs/fabricjs-tests.ts
index 621b104bd..89c882b05 100644
--- a/fabricjs/fabricjs-tests.ts
+++ b/fabricjs/fabricjs-tests.ts
@@ -70,7 +70,7 @@ function sample2() {
   //
   // Rendering canvas #2
   //
-  var canvas2 = new fabric.Canvas('c2', { backgroundColor: "#000", renderOnAddition: false }),
+  var canvas2 = new fabric.Canvas('c2', { backgroundColor: "#000", renderOnAddRemove: false }),
     results2 = document.getElementById('results-c2');
 
   startTimer();
@@ -84,7 +84,7 @@ function sample2() {
     canvas2.add(dot);
   }
   canvas2.renderAll(); // Note, calling renderAll() is important in this case
-  results2.innerHTML = 'Rendering 1000 elements using canvas.renderOnAddition = false in ' + stopTimer() + 'ms';
+  results2.innerHTML = 'Rendering 1000 elements using canvas.renderOnAddRemove = false in ' + stopTimer() + 'ms';
 }
 
 function sample3() {

From 146bbdc625b9c1fd9b1394196dea253e8b1b3431 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Mon, 3 Aug 2015 23:32:53 -0700
Subject: [PATCH 10/21] Added 'prev_button' to 'foundation'.

---
 foundation/foundation.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/foundation/foundation.d.ts b/foundation/foundation.d.ts
index c2dc4fc24..a51e47ae9 100644
--- a/foundation/foundation.d.ts
+++ b/foundation/foundation.d.ts
@@ -125,7 +125,8 @@ declare module Foundation {
             timer? : string;
             tip? : string;
             wrapper? : string;
-            button? : string;
+            button?: string;
+            prev_button?: string;
             modal? : string;
             expose? : string;
             expose_cover? : string;

From a087774998282f491e370b6309c01cf5b6d48482 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 4 Aug 2015 13:23:55 -0700
Subject: [PATCH 11/21] 'title' only seems to be expected for 'bootbox.dialog'
 in 'bootbox'.

---
 bootbox/bootbox-tests.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bootbox/bootbox-tests.ts b/bootbox/bootbox-tests.ts
index dbdfa252d..463170cd7 100644
--- a/bootbox/bootbox-tests.ts
+++ b/bootbox/bootbox-tests.ts
@@ -27,14 +27,12 @@ bootbox.prompt("Enter 'ok' to pass test", function (result) {
 	console.log(result);
 });
 bootbox.prompt({
-	title: "Wassup?",
 	message: "Enter 'ok' to pass test", callback: function (result) {
 		console.log(result);
 	}
 });
 bootbox.prompt({
 	size: "large",
-	title: "Wassup?",
 	message: "Enter 'ok' to pass test", callback: function (result) {
 		console.log(result);
 	}
@@ -42,6 +40,7 @@ bootbox.prompt({
 
 
 bootbox.dialog({
+	title: "Wassup?",
 	message: "Test Dialog",
 	callback: function (result) { }
 });

From c2202858a1cb155cf08b4f8ca9db3b7e55bbb132 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 4 Aug 2015 13:25:23 -0700
Subject: [PATCH 12/21] submenu -> subMenu

---
 contextjs/contextjs-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contextjs/contextjs-tests.ts b/contextjs/contextjs-tests.ts
index 7d54e80e6..0b0d55d09 100644
--- a/contextjs/contextjs-tests.ts
+++ b/contextjs/contextjs-tests.ts
@@ -7,7 +7,7 @@ context.settings({compress: true});
 context.attach('#test', [
   {header: 'header 1'},
   {divider: true},
-  {text:'foobar', submenu: [
+  {text:'foobar', subMenu: [
     {text:'sub1'},
     {text:'sub2'}
   ]}

From 9a706aae3af4cb55e059a50d89f2dc88c55c8ea2 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 4 Aug 2015 13:27:32 -0700
Subject: [PATCH 13/21] minSldies -> minSlides

---
 dw-bxslider-4/dw-bxslider-4-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dw-bxslider-4/dw-bxslider-4-tests.ts b/dw-bxslider-4/dw-bxslider-4-tests.ts
index 8844fcdbe..d4138cca1 100644
--- a/dw-bxslider-4/dw-bxslider-4-tests.ts
+++ b/dw-bxslider-4/dw-bxslider-4-tests.ts
@@ -26,7 +26,7 @@ $(document).ready(function() {
 
 	$('.slider1').bxSlider({
 		slideWidth: 200,
-		minSldies: 2,
+		minSlides: 2,
 		maxSlides: 3,
 		slideMargin: 10
 	});

From 12b3552f376be30200af3ef2bc9e643057b94f14 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 4 Aug 2015 13:41:39 -0700
Subject: [PATCH 14/21] All those 'g's seem to drag on in 'jquery.colorpicker'.

---
 jquery.colorpicker/jquery.colorpicker.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jquery.colorpicker/jquery.colorpicker.d.ts b/jquery.colorpicker/jquery.colorpicker.d.ts
index 683e28b96..469757589 100644
--- a/jquery.colorpicker/jquery.colorpicker.d.ts
+++ b/jquery.colorpicker/jquery.colorpicker.d.ts
@@ -21,7 +21,7 @@ interface JQueryColorpickerOptions {
     closeOnOutside?: boolean;
     color?: string;
     colorFormat?: string;
-    dragggable?: boolean;
+    draggable?: boolean;
     duration?: string;
     hsv?: boolean;
     inline?: boolean;

From 3fc00fb66b1a40ff9e551702d862bbe6b87e587c Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 4 Aug 2015 13:55:35 -0700
Subject: [PATCH 15/21] Multiline comments can have bad behaviour in
 'nouislider'.

---
 jquery.colorpicker/jquery.colorpicker.d.ts | 9 +++++++++
 nouislider/nouislider.d.ts                 | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/jquery.colorpicker/jquery.colorpicker.d.ts b/jquery.colorpicker/jquery.colorpicker.d.ts
index 469757589..5c89e4ed0 100644
--- a/jquery.colorpicker/jquery.colorpicker.d.ts
+++ b/jquery.colorpicker/jquery.colorpicker.d.ts
@@ -6,6 +6,15 @@
 /// <reference path="../jquery/jquery.d.ts" />
 
 interface JQueryColorpickerOptions {
+    // Events
+    // TODO: Figure out actual types.
+    cancel: Function,
+    close: Function,
+    init: Function,
+    select: Function,
+    ok: Function,
+    open: Function,
+
     alpha?: boolean;
     altAlpha?: boolean;
     altField?: string;
diff --git a/nouislider/nouislider.d.ts b/nouislider/nouislider.d.ts
index 5b1700b23..e82418d97 100644
--- a/nouislider/nouislider.d.ts
+++ b/nouislider/nouislider.d.ts
@@ -82,7 +82,7 @@ interface noUiSliderOptions {
     animate?: boolean;
     /**
      * All values on the slider are part of a range. The range has a minimum and maximum value.
-     *
+     */
     behaviour?: string;
     /**
      * To format the slider output, noUiSlider offers a format option. 

From bdc5c4bd640c8a553766e24d13f60ab899e85fd3 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 4 Aug 2015 13:57:14 -0700
Subject: [PATCH 16/21] margins -> margin

---
 pdfkit/pdfkit-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pdfkit/pdfkit-tests.ts b/pdfkit/pdfkit-tests.ts
index f60a00b1c..25a84e356 100644
--- a/pdfkit/pdfkit-tests.ts
+++ b/pdfkit/pdfkit-tests.ts
@@ -24,7 +24,7 @@ doc.addPage({
 });
 
 doc.addPage({
-  margins: {
+    margin: {
     top: 50,
     bottom: 50,
     left: 72,

From 6ddfcb9cf96bb1b10d63ca16ad7a44b25fc7d84a Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 4 Aug 2015 14:00:54 -0700
Subject: [PATCH 17/21] native -> nativeFS, autoPlay -> autoplay

---
 royalslider/royalslider-tests.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/royalslider/royalslider-tests.ts b/royalslider/royalslider-tests.ts
index f79bd413b..6cafcb6d6 100644
--- a/royalslider/royalslider-tests.ts
+++ b/royalslider/royalslider-tests.ts
@@ -27,7 +27,7 @@ jQuery(document).ready(function () {
         fullscreen: {
             // fullscreen options go gere
             enabled: true,
-            native: true
+            nativeFS: true
         }
     });
 });
@@ -49,7 +49,7 @@ jQuery(document).ready(function () {
     $(".royalSlider").royalSlider({
         // general options go gere
         autoScaleSlider: true,
-        autoPlay: {
+        autoplay: {
             // autoplay options go gere
             enabled: true,
             pauseOnHover: true

From 9d12f947a494cc9fa337be1b0a0afc1877fb216a Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 4 Aug 2015 14:03:56 -0700
Subject: [PATCH 18/21] Stoked about 'strokeStyle' in 'smoothie'.

---
 smoothie/smoothie.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/smoothie/smoothie.d.ts b/smoothie/smoothie.d.ts
index 714590f84..e01ab34d5 100644
--- a/smoothie/smoothie.d.ts
+++ b/smoothie/smoothie.d.ts
@@ -18,7 +18,7 @@ declare module "smoothie"
 
     export interface ITimeSeriesPresentationOptions
     {
-        stokeStyle?: string;
+        strokeStyle?: string;
         fillStyle?: string;
         lineWidth?: number;
     }
@@ -73,7 +73,7 @@ declare module "smoothie"
         /** The pixel width of grid lines. */
         lineWidth?: number;
         /** Colour of grid lines. */
-        stokeStyle?: string;
+        strokeStyle?: string;
         /** Distance between vertical grid lines. */
         millisPerLine?: number;
         /** Controls whether grid lines are 1px sharp, or softened. */

From 47945cca0cf349758614200d0ff1bc84a4bdf20d Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Tue, 4 Aug 2015 14:16:10 -0700
Subject: [PATCH 19/21] 'sourceURL' is a parameter, not a property on an
 options object.

---
 lodash/lodash-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index 14f68e1c4..6d04e75ea 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -1372,7 +1372,7 @@ result = <string>_.template('<% print("hello " + name); %>!', { 'name': 'larry'
 
 var listTemplate = '<% $.each(people, function(name) { %><li><%- name %></li><% }); %>';
 result = <string>_.template(listTemplate, { 'people': ['moe', 'larry'] }, { 'imports': { '$': jQuery } });
-result = <_.TemplateExecutor>_.template('hello <%= name %>', null, { 'sourceURL': '/basic/greeting.jst' });
+result = <_.TemplateExecutor>_.template('hello <%= name %>', null, /*sourceURL:*/ '/basic/greeting.jst');
 
 result = <_.TemplateExecutor>_.template('hi <%= data.name %>!', null, { 'variable': 'data' });
 result = <string>(<_.TemplateExecutor>result).source;

From e8b85f0f4875496c710a5d4bc4ccad388d21915c Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 5 Aug 2015 01:19:24 -0700
Subject: [PATCH 20/21] Normalize to tabs even though they're awful in 'ftp'.

---
 ftp/ftp-tests.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ftp/ftp-tests.ts b/ftp/ftp-tests.ts
index 57b706182..a40df2e55 100644
--- a/ftp/ftp-tests.ts
+++ b/ftp/ftp-tests.ts
@@ -19,8 +19,8 @@ c.connect();
 
 c.connect({
 	host: "127.0.0.1",
-    port: 21,
-    user: "Boo",
+	port: 21,
+	user: "Boo",
 	password: "secret"
 });
 

From 4bc2874a4534e4996ab19b2e1705030952fe3090 Mon Sep 17 00:00:00 2001
From: Daniel Rosenwasser <drosen@microsoft.com>
Date: Wed, 5 Aug 2015 01:22:34 -0700
Subject: [PATCH 21/21] Two spaces in 'pdfkit',

---
 pdfkit/pdfkit-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pdfkit/pdfkit-tests.ts b/pdfkit/pdfkit-tests.ts
index 25a84e356..87263e932 100644
--- a/pdfkit/pdfkit-tests.ts
+++ b/pdfkit/pdfkit-tests.ts
@@ -24,7 +24,7 @@ doc.addPage({
 });
 
 doc.addPage({
-    margin: {
+  margin: {
     top: 50,
     bottom: 50,
     left: 72,