Accidentally separated Ember.controllerFor tests + implementation
Merge pull request #1902 from stefanpenner/accidentally_seperated_test_and_implementation

Accidentally separated Ember.controllerFor tests + implementation