correctly extend default options

lib/model-factory.js

@@ -7,7 +7,13 @@ module.exports = (function() {
     var self = this
 
     this.options = Utils._.extend({
-      timestamps: true
+      timestamps: true,
+      instanceMethods: undefined,
+      classMethods: undefined,
+      validate: undefined,
+      freezeTableName: false,
+      underscored: false,
+      paranoid: false
     }, options || {})
 
     this.name = name

lib/model.js

@@ -9,7 +9,12 @@ module.exports = (function() {
     this.__definition = null // will be set in Model.build
     this.attributes = []
     this.validators = {} // holds validation settings for each attribute
-    this.__options = options || {}
+    this.__options = Utils._.extend({
+      underscored: false,
+      hasPrimaryKeys: false,
+      timestamps: true,
+      paranoid: false
+    }, options || {})
 
     initAttributes.call(this, values)
   }

lib/query.js

@@ -6,7 +6,10 @@ module.exports = (function() {
 
     this.client = client
     this.callee = callee
-    this.options = options || {}
+    this.options = Utils._.extend({
+      logging: true,
+      plain: false
+    }, options || {})
     this.bindClientFunction = function(err) { onFailure.call(self, err) }
   }
   Utils.addEventEmitter(Query)