Update to ember-cli master.

As of aa4e69658660f382da223a1f11730f0d7921b006.