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.
Add `ember build --watch`.

* options.watch => --watch flag, which is false by default.
* Build command chooses the task based on options.watch.
* Watch Task is in build-watch.js.
* Unit test in cli-test.js verifies that watch option is passed correctly.
* Acceptance test in smoke-test-slow.js, verifies that changes to file are written to rebuilt file by --watch.
* Empty catch comment.
* Updates changelog.
Merge branch 'build-watch'
Allow to pass options to import.

Previously you would do something like

```js
  this.import('vendor/ember-cli-shims/app-shims.js', {
    ember: ['default']
  });
```

Now you will have to pass a key with availableModules:

```js
  this.import('vendor/ember-cli-shims/app-shims.js', {
    availableModules: {
      ember: ['default']
    }
  });
```
Use exports instead of availableModules.
Support modules as options with deprecation message.
Include assetPath in deprecation message.