Merge pull request #1024 from chenn/fingerprint-custom-hash

Allow passing customHash in fingerprint options
Update CHANGELOG.md

can't have that!
Merge pull request #1114 from landonwilkins/patch-15

Update CHANGELOG.md
Update ember-qunit-notifications version

v0.0.1 had the problem of displaying fail image for both fail and success case.
Merge pull request #1117 from quaertym/master

Update ember-qunit-notifications version
Ensure that builder cleans directory properly.

Prior to this change, only the first item in the directory would be
removed (oops).
Merge pull request #1122 from rjackson/ensure-directory-is-cleaned-up

Ensure that builder cleans directory properly.
Ensure exit code is correct for `ember test` with failing tests.
Merge pull request #1123 from rjackson/exit-code-for-ci

Ensure exit code is correct for `ember test` with failing tests.
Add acceptance test confirming exit code from ember test.
Add middleware concept for addons.

* Refactors express server to explicitly start the http server. This was
  what it does naturally, but we need access to the raw server to be
  able to teardown the server between tests.
* Refactor express server to make it a bit more testable.
* Add `addon.serverMiddleware` callback function.  The addon is called
  with the instance of the express app.
* Refactor `api-stub` blueprint (and expected API) so that the express
  app is started in a consistent way. Prior to this, if you had a
  `./server/` folder, your code would create the `express` app add the `ember-cli`
  middleware.
Merge pull request #1124 from rjackson/test-for-exit-code

Add acceptance test confirming exit code from ember test.
Merge pull request #1097 from rjackson/addon-middleware

Add middleware concept for addons.
Improvements to generator behavior
Merge pull request #1120 from kimroen/properly-accept-camelCase

Some improvements to generator behavior
Update CHANGELOG.md

Updated CHANGELOG for PR [#1117](https://github.com/stefanpenner/ember-cli/pull/1117)
Updated commit to resolve conflicts
Merge pull request #1128 from quaertym/master

Update CHANGELOG.md
Allow addons to specify load ordering.

* Bring topsort algorithm from Ember (used for initializer ordering).
* Allow addons to use `ember-addon` key which resolves to an object with
  `main`, `before`, and `after` keys.
* Allow `ember-addon: { main: 'foo.js'}` as alternative to
  `ember-addon-main` in the `package.json`
* Change `availableAddons` to return an object with the `package.json`
  contents of each addon (was previously being looked up twice).
Merge pull request #1132 from rjackson/allow-addons-to-specify-ordering

Allow addons to specify load ordering.