Ensure we do not add `ember-addon` twice.
Merge pull request #1982 from rwjblue/do-not-add-ember-addon-twice

Ensure we do not add `ember-addon` twice.
Order dependencies alphabetically
Merge compiled addon/templates into addon/ JS tree.

This allows addon/templates to be properly available inside the
my-addon-name.js file with the correct module name.
Add addon template precomilation smoke test.
Merge pull request #1988 from quaertym/patch-12

Order dependencies alphabetically
Merge pull request #1983 from rwjblue/move-templates-into-addon-tree

Merge compiled addon/templates into addon/ JS tree.
Properly chain preprocessing plugins.
Merge pull request #1987 from rwjblue/properly-chain-plugins

Properly chain preprocessing plugins.
Ensure that registry plugins added manually can be returned.
Merge pull request #1993 from rwjblue/allow-registered-plugins-to-not-be-in-package-json

Ensure that registry plugins added manually can be returned.
Fix model-test blueprint.

Passing a model (anything with a `toJSON` actually) into a test
assertion causes infinite loop with Testem.

Steps:

* Do an assert in your test like ok(store.find('person', 1), "record
  exists")
* QUnit stores the assertion in a test object.
* The test finishes so the record is destroyed automatically.
* QUnit notifies listeners the test is over.
* Testem listens for test end notification and attempts to ensure that
  there are no cycles in it by calling `JSON.parse(JSON.stringify(testObject))`.
* Calls `toJSON()` recursively, including any destroyed object that was
  used in an assertion.

Watch as tests hang when running ember test but work fine everywhere else.
Merge pull request #1996 from rwjblue/fix-model-tests

Fix model-test blueprint.
Refactor addon fixtures.

Migrate to currently suggested exporting of an object.
Merge pull request #1995 from rwjblue/refactor-addon-tests

Refactor addon fixtures.
Fix NotFoundError's constructor property.

The correct subclassing pattern is to set the prototype's `constructor` property after setting up the class's prototype. NotFoundError's constructor should remain `Function`, since it is an instance of `Function`.
Do not use non-standard `String#contains` which may not be available.

In the tests the traceur runtime (included with es6-module-transpiler < v0.4.x) polyfills `String#contains`. When not including anything polyfilling this it will not be available.
Merge pull request #1999 from eventualbuddha/remove-nonstandard-string-contains

Do not use non-standard `String#contains` which may not be available.
Merge pull request #1998 from eventualbuddha/fix-not-found-error-constructor

Fix NotFoundError's constructor property.
Add tests for initializer blueprint.