fix controller data property assignment in ctor...

This allows the data function not to be defined. But if it is defined,
and it's a function, bind it to the controller instance.

fixes #962 while still also fixing #929. @tmeasday, confirm.

lib/route_controller.js

@@ -24,12 +24,8 @@ RouteController = Controller.extend({
     // is defined anywhere in the chain. This ensure that if we have
     // a data function somewhere in the chain, you can call this.data().
     this.data = this.lookupOption('data');
-    // all setting data statically, e.g. data: {foo: 'bar'}
-    if (typeof this.data !== 'function') {
-      var data = this.data;
-      this.data = function() { return data; }
-    }
-    if (this.data)
+
+    if (typeof this.data === 'function')
       this.data = _.bind(this.data, this);
 
     this.init(options);