More fixes from the cherry picks

Author: angusmcleod

assets/javascripts/wizard-qunit.js

@@ -1,11 +1,12 @@
+//= require env
+//= require jquery.debug
+//= require ember.debug
 //= require route-recognizer
 //= require fake_xml_http_request
 //= require pretender
 //= require qunit
 //= require ember-qunit
 //= require test-shims
-//= require jquery.debug
-//= require ember.debug
 //= require ember-template-compiler
 
 //= require_tree ./wizard/tests/fixtures