Merge branch 'master' of https://github.com/kytwb/sequelize into kytwb-master

Conflicts:
	package.json

package.json

@@ -32,11 +32,15 @@
     "url": "https://github.com/sequelize/sequelize/issues"
     "url": "https://github.com/sequelize/sequelize/issues"
   },
   },
   "dependencies": {
   "dependencies": {
-    "bluebird": "2.4.2",
+    "bluebird": "~2.9.24",
     "dottie": "^0.3.1",
     "dottie": "^0.3.1",
     "generic-pool": "2.2.0",
     "generic-pool": "2.2.0",
     "inflection": "^1.6.0",
     "inflection": "^1.6.0",
     "lodash": "^3.5.0",
     "lodash": "^3.5.0",
+    "dottie": "0.2.4",
+    "generic-pool": "2.1.1",
+    "inflection": "1.5.3",
+    "lodash": "~2.4.0",
     "moment": "^2.9.0",
     "moment": "^2.9.0",
     "node-uuid": "~1.4.1",
     "node-uuid": "~1.4.1",
     "toposort-class": "~0.3.0",
     "toposort-class": "~0.3.0",