Fixing issue mentioned in #51 with query function

Should use call rather than apply, test included

bookshelf.js

@@ -58,7 +58,7 @@
       if (args.length === 0) return this._builder;
       var method = args[0];
       if (_.isFunction(method)) {
-        method.apply(this._builder, this._builder);
+        method.call(this._builder, this._builder);
       } else if (_.isObject(method)) {
         for (var key in method) {
           var target = _.isArray(method[key]) ?  method[key] : [method[key]];

test/lib/model.js

@@ -127,6 +127,23 @@ module.exports = function(Bookshelf, handler) {
       equal(qb.wheres.length, 2);
     });
 
+    it('allows passing an function to query', function() {
+      var qb = model.resetQuery().query();
+      equal(qb.wheres.length, 0);
+      var q = model.query(function(qb) {
+        this.where({id: 1}).orWhere('id', '>', '10');
+      });
+      equal(q, model);
+      equal(qb.wheres.length, 2);
+      qb = model.resetQuery().query();
+      equal(qb.wheres.length, 0);
+      q = model.query(function(qb) {
+        qb.where({id: 1}).orWhere('id', '>', '10');
+      });
+      equal(q, model);
+      equal(qb.wheres.length, 2);
+    });
+
 
   });