Auto merge of #180 - DockYard:update-ember-cli, r=poteto
Auto merge of #180 - DockYard:update-ember-cli, r=poteto

Update ember-cli

None

DockYard/ember-functional-helpers,DockYard/ember-functional-helpers