Merge branch 'master' into handleExtraObjectLiteralProperties

node-mysql-wrapper/node-mysql-wrapper-tests.ts

@@ -1,5 +1,4 @@
 ///<reference path='./node-mysql-wrapper.d.ts' />
-///<reference path='../es6-promise/es6-promise.d.ts' />
 
 import wrapper = require("node-mysql-wrapper");
 var db = wrapper("mysql://kataras:pass@127.0.0.1/taglub?debug=false&charset=utf8");

node-mysql-wrapper/node-mysql-wrapper.d.ts

@@ -4,6 +4,7 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 ///<reference path='../mysql/mysql.d.ts' />
+///<reference path='./../bluebird/bluebird.d.ts' />
 
 declare module "node-mysql-wrapper" {
     import Mysql = require("mysql");