Map different Ember types correctly
Merge branch 'master' of github.com:gigafied/ember-amd