Upgrade ember-cli to master and make corresponding changes and cleanups.