Upgrade ember-cli to 0.0.42, and refactor templates and controllers