Remove or fix broken links
rearrange unit-testing basics and ember-qunit

previous order introduced ember-qunit, then didn't use it in the next
section on basic testing. put Ember.Object unit testing basics first,
then introduce ember-qunit.
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
Make the andThen discussion read better

There was some duplication with the prior paragraph and it didn't read very well. Also, the example wasn't explained. As this is the first example I think it pertinent to give it a thorough explanation.
Update test-helpers with promise-sequence info

Add missing explanation around the fact that the async test helpers are called in a sequenced chain, each one after the previous one, and only after they've each completed in call order.
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
just missing a close paren on the setResolver setup on the unit test intro guide
Merge pull request #1459 from belison/master

just missing a close paren on the setResolver setup on the unit test intro guide
add greenfield to company list
Controller Guide link update

Link was using relative path, which ended up being broken. Fixed link to use absolute path like other links in the guide in order to link to proper url
Merge pull request #1462 from JPBetley/master

Controller Guide link update
Update site for 1.5.1.
Merge pull request #1461 from mikepmunroe/add-company-to-about

add greenfield to company list
set correct watch a project permalink
Merge pull request #1466 from mikepmunroe/patch-2

set correct watch a project permalink
add redirect for previous testing/unit page