Merge changes after run `ember init`
Update to ember-cli 0.1.3
Merge branch 'upgrade-ember-cli'