Use lodash merge instead of defaults
Fix weird whitespace in .jshintrc
Merge pull request #1137 from njj023/master

Use lodash merge instead of defaults
Merge pull request #1172 from xtian/jshintrc-whitespace

Fix weird whitespace in .jshintrc
Api-stub blueprint: address two deprecation warnings:
  'body-parser deprecated bodyParser: use individual json/urlencoded middlewares'
  'body-parser deprecated urlencoded: explicitly specify "extended: true" for extended parsing'
Calling bodyParser() is deprecated.
Merge pull request #1174 from jdhoek/master

Api-stub blueprint: address two deprecation warnings
Api-stub blueprint: fix broken acceptance test.
Merge pull request #1176 from jdhoek/master

Api-stub blueprint: fix broken acceptance test.
Update ember-cli-ember-data to 0.1.0
Merge pull request #1178 from quaertym/master

Update ember-cli-ember-data to 0.1.0
Update ember-cli-ic-ajax to prevent warning.
Merge pull request #1180 from rjackson/update-ic-ajax

Update ember-cli-ic-ajax to prevent warning.
Close #1169 Failed build should return non-zero exit code
Merge pull request #1169 from ludekstepan/master

Failed build returns 0 exit code
Update CHANGELOG.md

Updated CHANGELOG.md to include PR number for [#1178](https://github.com/stefanpenner/ember-cli/pull/1178).
Merge pull request #1185 from quaertym/master

Update CHANGELOG.md
[BUGFIX] error when trailing slash present in argument to generator

[fixes #1164]
https://github.com/stefanpenner/ember-cli/issues/1164
Merge pull request #1184 from rondale-sc/fix-trailing-slash-generate-error

[BUGFIX] error when trailing slash present in argument to generator
Update CHANGELOG.md
[Bugfix] fix denodeify of ext/promise

proto to was not set correctly