Use this.controller instead of this.controllerFor
Merge pull request #1510 from bmac/this-controller

Use this.controller instead of this.controllerFor