Adding a comma for clarity

I think adding a comma here makes it clearer that it is just the template which has the same name as the route, not both the controller and the template.
Merge pull request #1450 from eneiand/patch-1

Adding a comma for clarity
Update test-helpers "fillIn" description

The fillIn method signature had "input_selector" but this was out of accord with the other helper method signatures. Should just be "selector", or change the other input ones to use input_selector. I chose to unify them all to "selector".
Merge pull request #1455 from JulianLeviston/patch-3

Update test-helpers "fillIn" description
correctly setup for ember-qunit

I had some difficulties testing components until I haven't discovered that you need to have `#ember-testing` div and `App.rootElement` set exactly to `ember-testing`. I've reported an issue [here](https://github.com/rpflorence/ember-qunit/issues/40).
Merge pull request #1456 from zigomir/patch-5

correctly setup for ember-qunit
Merge remote-tracking branch 'base/master'

Conflicts:
	source/guides/concepts/naming-conventions.md