lint fixes & bcrypt-nodejs

core/shared/models/base.js

@@ -2,9 +2,7 @@
 
     "use strict";
 
-    var _ = require('underscore'),
-        GhostBookshelf,
-        BookshelfBase,
+    var GhostBookshelf,
         Bookshelf = require('bookshelf'),
         config = require('../../../config');
 

core/shared/models/setting.js

@@ -5,8 +5,7 @@
         Settings,
         GhostBookshelf = require('./base'),
         _ = require('underscore'),
-        when = require('when'),
-        SettingsProvider;
+        when = require('when');
 
     Setting = GhostBookshelf.Model.extend({
 

core/shared/models/user.js

@@ -6,7 +6,7 @@
         _ = require('underscore'),
         when = require('when'),
         nodefn = require('when/node/function'),
-        bcrypt = require('bcrypt'),
+        bcrypt = require('bcrypt-nodejs'),
         Posts = require('./post').Posts,
         GhostBookshelf = require('./base');
 
@@ -33,7 +33,7 @@
                 // Clone the _user so we don't expose the hashed password unnecessarily
                 userData = _.extend({}, _user);
 
-            return nodefn.call(bcrypt.hash, _user.password, 10).then(function (hash) {
+            return nodefn.call(bcrypt.hash, _user.password, null, null).then(function (hash) {
                 userData.password = hash;
                 return GhostBookshelf.Model.add.call(User, userData);
             });