Switched to ember-cli versions of the files
Merge pull request #41 from achambers/use-ember-cli-objects

Switched to ember-cli versions of the files