Hand-ported changes from generator-ember for this project