Cleaning up for the latest ember.js
Merging in new changes.