Update for ember-cli v0.1.4

Fixes #35
Merge pull request #36 from kimroen/update-for-ember-cli-0-1-4

Update for ember-cli v0.1.4