Update for master of ember-cli
Merge pull request #12 from dockyard/bc-work-with-latest-deps

Update for master of ember-cli