Fixing the mess from the previous commit. Can only upgrade to Ember 1.5.0 atm because of some weird ass handlebars issue