From 8977d5917b7d9e1f0dfad2e6a3127cc13b49ef60 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Thu, 4 Dec 2014 09:35:11 +1100
Subject: [PATCH] revert

---
 app/assets/javascripts/admin.js.erb           |     7 +
 .../discourse/models/category_list.js         |     2 +-
 .../discourse/models/post_stream.js           |     2 +-
 .../javascripts/discourse/templates/topic.hbs |     2 +-
 .../discourse/views/reply-history.js.es6      |     9 +
 app/assets/javascripts/main_include_admin.js  |     1 -
 .../stylesheets/common/foundation/base.scss   |     3 -
 app/views/layouts/application.html.erb        |     3 -
 .../javascripts/initializers/poll.js.es6      |    19 +-
 .../models/post-stream-test.js.es6            |     2 +-
 .../assets/javascripts/development/ember.js   | 12021 +++++++---------
 .../{ => development}/list-view.js            |   238 +-
 vendor/assets/javascripts/ember-cloaking.js   |    58 +-
 vendor/assets/javascripts/production/ember.js | 11750 +++++++--------
 .../javascripts/production/list-view.js       |     8 +
 15 files changed, 10667 insertions(+), 13458 deletions(-)
 rename vendor/assets/javascripts/{ => development}/list-view.js (91%)
 create mode 100755 vendor/assets/javascripts/production/list-view.js

diff --git a/app/assets/javascripts/admin.js.erb b/app/assets/javascripts/admin.js.erb
index ce47046a21..3c536f4ca6 100644
--- a/app/assets/javascripts/admin.js.erb
+++ b/app/assets/javascripts/admin.js.erb
@@ -1,5 +1,12 @@
 <%
+if Rails.env.development?
+  require_asset ("development/list-view.js")
+else
+  require_asset ("production/list-view.js")
+end
+
 require_asset("main_include_admin.js")
 
 DiscoursePluginRegistry.admin_javascripts.each { |js| require_asset(js) }
+
 %>
diff --git a/app/assets/javascripts/discourse/models/category_list.js b/app/assets/javascripts/discourse/models/category_list.js
index ee8b08c158..c0478499d3 100644
--- a/app/assets/javascripts/discourse/models/category_list.js
+++ b/app/assets/javascripts/discourse/models/category_list.js
@@ -8,7 +8,7 @@
 **/
 Discourse.CategoryList = Ember.ArrayProxy.extend({
   init: function() {
-    this.set('content', []);
+    this.content = [];
     this._super();
   }
 });
diff --git a/app/assets/javascripts/discourse/models/post_stream.js b/app/assets/javascripts/discourse/models/post_stream.js
index 583a7939c8..026b84e3cf 100644
--- a/app/assets/javascripts/discourse/models/post_stream.js
+++ b/app/assets/javascripts/discourse/models/post_stream.js
@@ -527,7 +527,7 @@ Discourse.PostStream = Em.Object.extend({
     this.get('stream').removeObjects(postIds);
     this.get('posts').removeObjects(posts);
     postIds.forEach(function(id){
-      identityMap.delete(id);
+      identityMap.remove(id);
     });
   },
 
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index b53bc01ef2..37feb1da48 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -73,7 +73,7 @@
           {{loading-spinner condition=postStream.loadingAbove}}
 
           {{#unless postStream.loadingFilter}}
-            {{cloaked-collection itemViewClass="post"
+            {{cloaked-collection cloakView="post"
                                  idProperty="post_number"
                                  defaultHeight="200"
                                  content=postStream.posts
diff --git a/app/assets/javascripts/discourse/views/reply-history.js.es6 b/app/assets/javascripts/discourse/views/reply-history.js.es6
index e1f2cb45bc..c5f81fa477 100644
--- a/app/assets/javascripts/discourse/views/reply-history.js.es6
+++ b/app/assets/javascripts/discourse/views/reply-history.js.es6
@@ -1,3 +1,10 @@
+/**
+  Lists previous posts in the history of a post.
+
+  @class ReplyHistory
+  @namespace Discourse
+  @module Discourse
+**/
 export default Em.CollectionView.extend({
   tagName: 'section',
   classNameBindings: [':embedded-posts', ':top', ':topic-body', ':offset2', 'hidden'],
@@ -5,3 +12,5 @@ export default Em.CollectionView.extend({
   hidden: Em.computed.equal('content.length', 0),
   previousPost: true
 });
+
+
diff --git a/app/assets/javascripts/main_include_admin.js b/app/assets/javascripts/main_include_admin.js
index 2cd37f1596..d83be37c14 100644
--- a/app/assets/javascripts/main_include_admin.js
+++ b/app/assets/javascripts/main_include_admin.js
@@ -1,4 +1,3 @@
-//= require list-view
 //= require admin/models/user-field
 //= require admin/controllers/admin-email-skipped
 //= require admin/controllers/change-site-customization-details
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index 1eec1d65dc..656248df67 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -92,6 +92,3 @@ pre code {
 .row:after {clear: both;}
 
 
-#offscreen-content {
-  display: none;
-}
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 111e92e818..931637e822 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -61,9 +61,6 @@
     <section id='main'>
     </section>
 
-    <div id='offscreen-content'>
-    </div>
-
     <% unless current_user %>
       <form id='hidden-login-form' method="post" action="<%=login_path%>" style="display: none;">
         <input name="username" type="text"     id="signin_username">
diff --git a/plugins/poll/assets/javascripts/initializers/poll.js.es6 b/plugins/poll/assets/javascripts/initializers/poll.js.es6
index 61bdeb321f..c55cac7eca 100644
--- a/plugins/poll/assets/javascripts/initializers/poll.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/poll.js.es6
@@ -49,6 +49,12 @@ var Poll = Discourse.Model.extend({
 var PollView = Ember.View.extend({
   templateName: "poll",
   classNames: ['poll-ui'],
+
+  replaceElement: function(target) {
+    this._insertElementLater(function() {
+      target.replaceWith(this.$());
+    });
+  }
 });
 
 function initializePollView(self) {
@@ -64,9 +70,13 @@ function initializePollView(self) {
     postController: self.get('controller')
   });
 
-  return self.createChildView(PollView, { controller: pollController });
+  var pollView = self.createChildView(PollView, {
+    controller: pollController
+  });
+  return pollView;
 }
 
+
 export default {
   name: 'poll',
 
@@ -80,14 +90,13 @@ export default {
         }
 
         var view = initializePollView(this);
+
         var pollContainer = $post.find(".poll-ui:first");
         if (pollContainer.length === 0) {
           pollContainer = $post.find("ul:first");
         }
 
-        var $div = $('<div>');
-        pollContainer.replaceWith($div);
-        view.constructor.renderer.appendTo(view, $div[0]);
+        view.replaceElement(pollContainer);
         this.set('pollView', view);
 
       }.on('postViewInserted'),
@@ -99,4 +108,4 @@ export default {
       }.on('willClearRender')
     });
   }
-};
+}
diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js.es6
index 50b86de67e..dcb06d1305 100644
--- a/test/javascripts/models/post-stream-test.js.es6
+++ b/test/javascripts/models/post-stream-test.js.es6
@@ -233,7 +233,7 @@ test("storePost", function() {
   var postWithoutId = Discourse.Post.create({raw: 'hello world'});
   stored = postStream.storePost(postWithoutId);
   equal(stored, postWithoutId, "it returns the same post back");
-  equal(postStream.get('postIdentityMap.size'), 1, "it does not add a new entry into the identity map");
+  equal(postStream.get('postIdentityMap.length'), 1, "it does not add a new entry into the identity map");
 
 });
 
diff --git a/vendor/assets/javascripts/development/ember.js b/vendor/assets/javascripts/development/ember.js
index 9e52da89de..4e25fe0987 100644
--- a/vendor/assets/javascripts/development/ember.js
+++ b/vendor/assets/javascripts/development/ember.js
@@ -5,24 +5,24 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   1.8.1
+ * @version   1.7.1
  */
 
 (function() {
-var enifed, requireModule, eriuqer, requirejs, Ember;
+var define, requireModule, require, requirejs, Ember;
 
 (function() {
   Ember = this.Ember = this.Ember || {};
-  if (typeof Ember === 'undefined') { Ember = {}; };
+  if (typeof Ember === 'undefined') { Ember = {} };
 
   if (typeof Ember.__loader === 'undefined') {
     var registry = {}, seen = {};
 
-    enifed = function(name, deps, callback) {
+    define = function(name, deps, callback) {
       registry[name] = { deps: deps, callback: callback };
     };
 
-    requirejs = eriuqer = requireModule = function(name) {
+    requirejs = require = requireModule = function(name) {
       if (seen.hasOwnProperty(name)) { return seen[name]; }
       seen[name] = {};
 
@@ -30,11 +30,11 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
         throw new Error("Could not find module " + name);
       }
 
-      var mod = registry[name];
-      var deps = mod.deps;
-      var callback = mod.callback;
-      var reified = [];
-      var exports;
+      var mod = registry[name],
+      deps = mod.deps,
+      callback = mod.callback,
+      reified = [],
+      exports;
 
       for (var i=0, l=deps.length; i<l; i++) {
         if (deps[i] === 'exports') {
@@ -65,34 +65,42 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
     };
     requirejs._eak_seen = registry;
 
-    Ember.__loader = {define: enifed, require: eriuqer, registry: registry};
+    Ember.__loader = {define: define, require: require, registry: registry};
   } else {
-    enifed = Ember.__loader.define;
-    requirejs = eriuqer = requireModule = Ember.__loader.require;
+    define = Ember.__loader.define;
+    requirejs = require = requireModule = Ember.__loader.require;
   }
 })();
 
-enifed("backburner",
-  ["backburner/utils","backburner/platform","backburner/binary-search","backburner/deferred-action-queues","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+define("backburner",
+  ["backburner/utils","backburner/deferred_action_queues","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var each = __dependency1__.each;
-    var isString = __dependency1__.isString;
-    var isFunction = __dependency1__.isFunction;
-    var isNumber = __dependency1__.isNumber;
-    var isCoercableNumber = __dependency1__.isCoercableNumber;
-    var wrapInTryCatch = __dependency1__.wrapInTryCatch;
-    var now = __dependency1__.now;
+    var Utils = __dependency1__["default"];
+    var DeferredActionQueues = __dependency2__.DeferredActionQueues;
 
-    var needsIETryCatchFix = __dependency2__.needsIETryCatchFix;
+    var slice = [].slice,
+        pop = [].pop,
+        each = Utils.each,
+        isString = Utils.isString,
+        isFunction = Utils.isFunction,
+        isNumber = Utils.isNumber,
+        timers = [],
+        global = this,
+        NUMBER = /\d+/;
 
-    var searchTimer = __dependency3__["default"];
+    // In IE 6-8, try/finally doesn't work without a catch.
+    // Unfortunately, this is impossible to test for since wrapping it in a parent try/catch doesn't trigger the bug.
+    // This tests for another broken try/catch behavior that only exhibits in the same versions of IE.
+    var needsIETryCatchFix = (function(e,x){
+      try{ x(); }
+      catch(e) { } // jshint ignore:line
+      return !!e;
+    })();
 
-    var DeferredActionQueues = __dependency4__["default"];
-
-    var slice = [].slice;
-    var pop = [].pop;
-    var global = this;
+    function isCoercableNumber(number) {
+      return isNumber(number) || NUMBER.test(number);
+    }
 
     function Backburner(queueNames, options) {
       this.queueNames = queueNames;
@@ -103,14 +111,18 @@ enifed("backburner",
       this.instanceStack = [];
       this._debouncees = [];
       this._throttlers = [];
-      this._timers = [];
     }
 
     Backburner.prototype = {
+      queueNames: null,
+      options: null,
+      currentInstance: null,
+      instanceStack: null,
+
       begin: function() {
-        var options = this.options;
-        var onBegin = options && options.onBegin;
-        var previousInstance = this.currentInstance;
+        var options = this.options,
+            onBegin = options && options.onBegin,
+            previousInstance = this.currentInstance;
 
         if (previousInstance) {
           this.instanceStack.push(previousInstance);
@@ -123,10 +135,10 @@ enifed("backburner",
       },
 
       end: function() {
-        var options = this.options;
-        var onEnd = options && options.onEnd;
-        var currentInstance = this.currentInstance;
-        var nextInstance = null;
+        var options = this.options,
+            onEnd = options && options.onEnd,
+            currentInstance = this.currentInstance,
+            nextInstance = null;
 
         // Prevent double-finally bug in Safari 6.0.2 and iOS 6
         // This bug appears to be resolved in Safari 6.0.5 and iOS 7
@@ -203,19 +215,8 @@ enifed("backburner",
           method = target[method];
         }
 
-        var stack = this.DEBUG ? new Error() : undefined;
-        var length = arguments.length;
-        var args;
-
-        if (length > 3) {
-          args = new Array(length - 3);
-          for (var i = 3; i < length; i++) {
-            args[i-3] = arguments[i];
-          }
-        } else {
-          args = undefined;
-        }
-
+        var stack = this.DEBUG ? new Error() : undefined,
+            args = arguments.length > 3 ? slice.call(arguments, 3) : undefined;
         if (!this.currentInstance) { createAutorun(this); }
         return this.currentInstance.schedule(queueName, target, method, args, false, stack);
       },
@@ -230,34 +231,15 @@ enifed("backburner",
           method = target[method];
         }
 
-        var stack = this.DEBUG ? new Error() : undefined;
-        var length = arguments.length;
-        var args;
-
-        if (length > 3) {
-          args = new Array(length - 3);
-          for (var i = 3; i < length; i++) {
-            args[i-3] = arguments[i];
-          }
-        } else {
-          args = undefined;
-        }
-
-        if (!this.currentInstance) {
-          createAutorun(this);
-        }
+        var stack = this.DEBUG ? new Error() : undefined,
+            args = arguments.length > 3 ? slice.call(arguments, 3) : undefined;
+        if (!this.currentInstance) { createAutorun(this); }
         return this.currentInstance.schedule(queueName, target, method, args, true, stack);
       },
 
       setTimeout: function() {
-        var l = arguments.length;
-        var args = new Array(l);
-
-        for (var x = 0; x < l; x++) {
-          args[x] = arguments[x];
-        }
-
-        var length = args.length,
+        var args = slice.call(arguments),
+            length = args.length,
             method, wait, target,
             methodOrTarget, methodOrWait, methodOrArgs;
 
@@ -303,7 +285,7 @@ enifed("backburner",
           }
         }
 
-        var executeAt = now() + parseInt(wait, 10);
+        var executeAt = (+new Date()) + parseInt(wait, 10);
 
         if (isString(method)) {
           method = target[method];
@@ -324,9 +306,9 @@ enifed("backburner",
         }
 
         // find position to insert
-        var i = searchTimer(executeAt, this._timers);
+        var i = searchTimer(executeAt, timers);
 
-        this._timers.splice(i, 0, executeAt, fn);
+        timers.splice(i, 0, executeAt, fn);
 
         updateLaterTimer(this, executeAt, wait);
 
@@ -334,10 +316,13 @@ enifed("backburner",
       },
 
       throttle: function(target, method /* , args, wait, [immediate] */) {
-        var backburner = this;
-        var args = arguments;
-        var immediate = pop.call(args);
-        var wait, throttler, index, timer;
+        var self = this,
+            args = arguments,
+            immediate = pop.call(args),
+            wait,
+            throttler,
+            index,
+            timer;
 
         if (isNumber(immediate) || isString(immediate)) {
           wait = immediate;
@@ -353,16 +338,16 @@ enifed("backburner",
 
         timer = global.setTimeout(function() {
           if (!immediate) {
-            backburner.run.apply(backburner, args);
+            self.run.apply(self, args);
           }
-          var index = findThrottler(target, method, backburner._throttlers);
+          var index = findThrottler(target, method, self._throttlers);
           if (index > -1) {
-            backburner._throttlers.splice(index, 1);
+            self._throttlers.splice(index, 1);
           }
         }, wait);
 
         if (immediate) {
-          this.run.apply(this, args);
+          self.run.apply(self, args);
         }
 
         throttler = [target, method, timer];
@@ -373,10 +358,13 @@ enifed("backburner",
       },
 
       debounce: function(target, method /* , args, wait, [immediate] */) {
-        var backburner = this;
-        var args = arguments;
-        var immediate = pop.call(args);
-        var wait, index, debouncee, timer;
+        var self = this,
+            args = arguments,
+            immediate = pop.call(args),
+            wait,
+            index,
+            debouncee,
+            timer;
 
         if (isNumber(immediate) || isString(immediate)) {
           wait = immediate;
@@ -397,25 +385,21 @@ enifed("backburner",
 
         timer = global.setTimeout(function() {
           if (!immediate) {
-            backburner.run.apply(backburner, args);
+            self.run.apply(self, args);
           }
-          var index = findDebouncee(target, method, backburner._debouncees);
+          var index = findDebouncee(target, method, self._debouncees);
           if (index > -1) {
-            backburner._debouncees.splice(index, 1);
+            self._debouncees.splice(index, 1);
           }
         }, wait);
 
         if (immediate && index === -1) {
-          backburner.run.apply(backburner, args);
+          self.run.apply(self, args);
         }
 
-        debouncee = [
-          target,
-          method,
-          timer
-        ];
+        debouncee = [target, method, timer];
 
-        backburner._debouncees.push(debouncee);
+        self._debouncees.push(debouncee);
 
         return debouncee;
       },
@@ -435,7 +419,7 @@ enifed("backburner",
           clearTimeout(this._laterTimer);
           this._laterTimer = null;
         }
-        this._timers = [];
+        timers = [];
 
         if (this._autorun) {
           clearTimeout(this._autorun);
@@ -444,7 +428,7 @@ enifed("backburner",
       },
 
       hasTimers: function() {
-        return !!this._timers.length || !!this._debouncees.length || !!this._throttlers.length || this._autorun;
+        return !!timers.length || !!this._debouncees.length || !!this._throttlers.length || this._autorun;
       },
 
       cancel: function(timer) {
@@ -453,18 +437,9 @@ enifed("backburner",
         if (timer && timerType === 'object' && timer.queue && timer.method) { // we're cancelling a deferOnce
           return timer.queue.cancel(timer);
         } else if (timerType === 'function') { // we're cancelling a setTimeout
-          for (var i = 0, l = this._timers.length; i < l; i += 2) {
-            if (this._timers[i + 1] === timer) {
-              this._timers.splice(i, 2); // remove the two elements
-              if (i === 0) {
-                if (this._laterTimer) { // Active timer? Then clear timer and reset for future timer
-                  clearTimeout(this._laterTimer);
-                  this._laterTimer = null;
-                }
-                if (this._timers.length > 0) { // Update to next available timer when available
-                  updateLaterTimer(this, this._timers[0], this._timers[0] - now());
-                }
-              }
+          for (var i = 0, l = timers.length; i < l; i += 2) {
+            if (timers[i + 1] === timer) {
+              timers.splice(i, 2); // remove the two elements
               return true;
             }
           }
@@ -477,17 +452,18 @@ enifed("backburner",
       },
 
       _cancelItem: function(findMethod, array, timer){
-        var item, index;
+        var item,
+            index;
 
         if (timer.length < 3) { return false; }
 
         index = findMethod(timer[0], timer[1], array);
 
-        if (index > -1) {
+        if(index > -1) {
 
           item = array[index];
 
-          if (item[2] === timer[2]) {
+          if(item[2] === timer[2]){
             array.splice(index, 1);
             clearTimeout(timer[2]);
             return true;
@@ -510,10 +486,21 @@ enifed("backburner",
       Backburner.prototype.end = wrapInTryCatch(originalEnd);
     }
 
+    function wrapInTryCatch(func) {
+      return function () {
+        try {
+          return func.apply(this, arguments);
+        } catch (e) {
+          throw e;
+        }
+      };
+    }
+
     function getOnError(options) {
       return options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
     }
 
+
     function createAutorun(backburner) {
       backburner.begin();
       backburner._autorun = global.setTimeout(function() {
@@ -522,48 +509,33 @@ enifed("backburner",
       });
     }
 
-    function updateLaterTimer(backburner, executeAt, wait) {
-      var n = now();
-      if (!backburner._laterTimer || executeAt < backburner._laterTimerExpiresAt || backburner._laterTimerExpiresAt < n) {
-
-        if (backburner._laterTimer) {
-          // Clear when:
-          // - Already expired
-          // - New timer is earlier
-          clearTimeout(backburner._laterTimer);
-
-          if (backburner._laterTimerExpiresAt < n) { // If timer was never triggered
-            // Calculate the left-over wait-time
-            wait = Math.max(0, executeAt - n);
-          }
-        }
-
-        backburner._laterTimer = global.setTimeout(function() {
-          backburner._laterTimer = null;
-          backburner._laterTimerExpiresAt = null;
-          executeTimers(backburner);
+    function updateLaterTimer(self, executeAt, wait) {
+      if (!self._laterTimer || executeAt < self._laterTimerExpiresAt) {
+        self._laterTimer = global.setTimeout(function() {
+          self._laterTimer = null;
+          self._laterTimerExpiresAt = null;
+          executeTimers(self);
         }, wait);
-
-        backburner._laterTimerExpiresAt = n + wait;
+        self._laterTimerExpiresAt = executeAt;
       }
     }
 
-    function executeTimers(backburner) {
-      var n = now();
-      var fns, i, l;
+    function executeTimers(self) {
+      var now = +new Date(),
+          time, fns, i, l;
 
-      backburner.run(function() {
-        i = searchTimer(n, backburner._timers);
+      self.run(function() {
+        i = searchTimer(now, timers);
 
-        fns = backburner._timers.splice(0, i);
+        fns = timers.splice(0, i);
 
         for (i = 1, l = fns.length; i < l; i += 2) {
-          backburner.schedule(backburner.options.defaultQueue, null, fns[i]);
+          self.schedule(self.options.defaultQueue, null, fns[i]);
         }
       });
 
-      if (backburner._timers.length) {
-        updateLaterTimer(backburner, backburner._timers[0], backburner._timers[0] - n);
+      if (timers.length) {
+        updateLaterTimer(self, timers[0], timers[0] - now);
       }
     }
 
@@ -576,8 +548,8 @@ enifed("backburner",
     }
 
     function findItem(target, method, collection) {
-      var item;
-      var index = -1;
+      var item,
+          index = -1;
 
       for (var i = 0, l = collection.length; i < l; i++) {
         item = collection[i];
@@ -590,31 +562,10 @@ enifed("backburner",
       return index;
     }
 
-    __exports__["default"] = Backburner;
-  });
-enifed("backburner.umd",
-  ["./backburner"],
-  function(__dependency1__) {
-    "use strict";
-    var Backburner = __dependency1__["default"];
-
-    /* global define:true module:true window: true */
-    if (typeof enifed === 'function' && enifed.amd) {
-      enifed(function() { return Backburner; });
-    } else if (typeof module !== 'undefined' && module.exports) {
-      module.exports = Backburner;
-    } else if (typeof this !== 'undefined') {
-      this['Backburner'] = Backburner;
-    }
-  });
-enifed("backburner/binary-search",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    __exports__["default"] = function binarySearch(time, timers) {
-      var start = 0;
-      var end = timers.length - 2;
-      var middle, l;
+    function searchTimer(time, timers) {
+      var start = 0,
+          end = timers.length - 2,
+          middle, l;
 
       while (start < end) {
         // since timers is an array of pairs 'l' will always
@@ -634,14 +585,18 @@ enifed("backburner/binary-search",
 
       return (time >= timers[start]) ? start + 2 : start;
     }
+
+    __exports__.Backburner = Backburner;
   });
-enifed("backburner/deferred-action-queues",
-  ["./utils","./queue","exports"],
+define("backburner/deferred_action_queues",
+  ["backburner/utils","backburner/queue","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var each = __dependency1__.each;
-    var isString = __dependency1__.isString;
-    var Queue = __dependency2__["default"];
+    var Utils = __dependency1__["default"];
+    var Queue = __dependency2__.Queue;
+
+    var each = Utils.each,
+        isString = Utils.isString;
 
     function DeferredActionQueues(queueNames, options) {
       var queues = this.queues = {};
@@ -650,20 +605,20 @@ enifed("backburner/deferred-action-queues",
       this.options = options;
 
       each(queueNames, function(queueName) {
-        queues[queueName] = new Queue(queueName, options[queueName], options);
+        queues[queueName] = new Queue(this, queueName, options);
       });
     }
 
-    function noSuchQueue(name) {
-      throw new Error("You attempted to schedule an action in a queue (" + name + ") that doesn't exist");
-    }
-
     DeferredActionQueues.prototype = {
-      schedule: function(name, target, method, args, onceFlag, stack) {
-        var queues = this.queues;
-        var queue = queues[name];
+      queueNames: null,
+      queues: null,
+      options: null,
 
-        if (!queue) { noSuchQueue(name); }
+      schedule: function(queueName, target, method, args, onceFlag, stack) {
+        var queues = this.queues,
+            queue = queues[queueName];
+
+        if (!queue) { throw new Error("You attempted to schedule an action in a queue (" + queueName + ") that doesn't exist"); }
 
         if (onceFlag) {
           return queue.pushUnique(target, method, args, stack);
@@ -672,7 +627,7 @@ enifed("backburner/deferred-action-queues",
         }
       },
 
-      invoke: function(target, method, args, _, _errorRecordedForStack) {
+      invoke: function(target, method, args, _) {
         if (args && args.length > 0) {
           method.apply(target, args);
         } else {
@@ -680,7 +635,7 @@ enifed("backburner/deferred-action-queues",
         }
       },
 
-      invokeWithOnError: function(target, method, args, onError, errorRecordedForStack) {
+      invokeWithOnError: function(target, method, args, onError) {
         try {
           if (args && args.length > 0) {
             method.apply(target, args);
@@ -688,80 +643,59 @@ enifed("backburner/deferred-action-queues",
             method.call(target);
           }
         } catch(error) {
-          onError(error, errorRecordedForStack);
+          onError(error);
         }
       },
 
       flush: function() {
-        var queues = this.queues;
-        var queueNames = this.queueNames;
-        var queueName, queue, queueItems, priorQueueNameIndex;
-        var queueNameIndex = 0;
-        var numberOfQueues = queueNames.length;
-        var options = this.options;
-        var onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
-        var invoke = onError ? this.invokeWithOnError : this.invoke;
+        var queues = this.queues,
+            queueNames = this.queueNames,
+            queueName, queue, queueItems, priorQueueNameIndex,
+            queueNameIndex = 0, numberOfQueues = queueNames.length,
+            options = this.options,
+            onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]),
+            invoke = onError ? this.invokeWithOnError : this.invoke;
 
+        outerloop:
         while (queueNameIndex < numberOfQueues) {
           queueName = queueNames[queueNameIndex];
           queue = queues[queueName];
           queueItems = queue._queueBeingFlushed = queue._queue.slice();
           queue._queue = [];
-          queue.targetQueues = Object.create(null);
 
-          var queueOptions = queue.options; // TODO: write a test for this
-          var before = queueOptions && queueOptions.before;
-          var after = queueOptions && queueOptions.after;
-          var target, method, args, errorRecordedForStack;
-          var queueIndex = 0;
-          var numberOfQueueItems = queueItems.length;
+          var queueOptions = queue.options, // TODO: write a test for this
+              before = queueOptions && queueOptions.before,
+              after = queueOptions && queueOptions.after,
+              target, method, args, stack,
+              queueIndex = 0, numberOfQueueItems = queueItems.length;
 
-          if (numberOfQueueItems && before) {
-            before();
-          }
+          if (numberOfQueueItems && before) { before(); }
 
           while (queueIndex < numberOfQueueItems) {
-            target                = queueItems[queueIndex];
-            method                = queueItems[queueIndex+1];
-            args                  = queueItems[queueIndex+2];
-            errorRecordedForStack = queueItems[queueIndex+3]; // Debugging assistance
+            target = queueItems[queueIndex];
+            method = queueItems[queueIndex+1];
+            args   = queueItems[queueIndex+2];
+            stack  = queueItems[queueIndex+3]; // Debugging assistance
 
-            //
-
-            if (isString(method)) {
-              method = target[method];
-            }
+            if (isString(method)) { method = target[method]; }
 
             // method could have been nullified / canceled during flush
             if (method) {
-              //
-              //    ** Attention intrepid developer **
-              //
-              //    To find out the stack of this task when it was scheduled onto
-              //    the run loop, add the following to your app.js:
-              //
-              //    Ember.run.backburner.DEBUG = true; // NOTE: This slows your app, don't leave it on in production.
-              //
-              //    Once that is in place, when you are at a breakpoint and navigate
-              //    here in the stack explorer, you can look at `errorRecordedForStack.stack`,
-              //    which will be the captured stack when this job was scheduled.
-              //
-              invoke(target, method, args, onError, errorRecordedForStack);
+              invoke(target, method, args, onError);
             }
 
             queueIndex += 4;
           }
 
           queue._queueBeingFlushed = null;
-          if (numberOfQueueItems && after) {
-            after();
-          }
+          if (numberOfQueueItems && after) { after(); }
 
           if ((priorQueueNameIndex = indexOfPriorQueueWithActions(this, queueNameIndex)) !== -1) {
             queueNameIndex = priorQueueNameIndex;
-          } else {
-            queueNameIndex++;
+            continue outerloop;
           }
+
+          queueNameIndex++;
         }
       }
     };
@@ -778,134 +712,60 @@ enifed("backburner/deferred-action-queues",
       return -1;
     }
 
-    __exports__["default"] = DeferredActionQueues;
+    __exports__.DeferredActionQueues = DeferredActionQueues;
   });
-enifed("backburner/platform",
+define("backburner/queue",
   ["exports"],
   function(__exports__) {
     "use strict";
-    // In IE 6-8, try/finally doesn't work without a catch.
-    // Unfortunately, this is impossible to test for since wrapping it in a parent try/catch doesn't trigger the bug.
-    // This tests for another broken try/catch behavior that only exhibits in the same versions of IE.
-    var needsIETryCatchFix = (function(e,x){
-      try{ x(); }
-      catch(e) { } // jshint ignore:line
-      return !!e;
-    })();
-    __exports__.needsIETryCatchFix = needsIETryCatchFix;
-  });
-enifed("backburner/queue",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    function Queue(name, options, globalOptions) {
+    function Queue(daq, name, options) {
+      this.daq = daq;
       this.name = name;
-      this.globalOptions = globalOptions || {};
-      this.options = options;
+      this.globalOptions = options;
+      this.options = options[name];
       this._queue = [];
-      this.targetQueues = Object.create(null);
-      this._queueBeingFlushed = undefined;
     }
 
     Queue.prototype = {
+      daq: null,
+      name: null,
+      options: null,
+      onError: null,
+      _queue: null,
+
       push: function(target, method, args, stack) {
         var queue = this._queue;
         queue.push(target, method, args, stack);
-
-        return {
-          queue: this,
-          target: target,
-          method: method
-        };
-      },
-
-      pushUniqueWithoutGuid: function(target, method, args, stack) {
-        var queue = this._queue;
-
-        for (var i = 0, l = queue.length; i < l; i += 4) {
-          var currentTarget = queue[i];
-          var currentMethod = queue[i+1];
-
-          if (currentTarget === target && currentMethod === method) {
-            queue[i+2] = args;  // replace args
-            queue[i+3] = stack; // replace stack
-            return;
-          }
-        }
-
-        queue.push(target, method, args, stack);
-      },
-
-      targetQueue: function(targetQueue, target, method, args, stack) {
-        var queue = this._queue;
-
-        for (var i = 0, l = targetQueue.length; i < l; i += 4) {
-          var currentMethod = targetQueue[i];
-          var currentIndex  = targetQueue[i + 1];
-
-          if (currentMethod === method) {
-            queue[currentIndex + 2] = args;  // replace args
-            queue[currentIndex + 3] = stack; // replace stack
-            return;
-          }
-        }
-
-        targetQueue.push(
-          method,
-          queue.push(target, method, args, stack) - 4
-        );
-      },
-
-      pushUniqueWithGuid: function(guid, target, method, args, stack) {
-        var hasLocalQueue = this.targetQueues[guid];
-
-        if (hasLocalQueue) {
-          this.targetQueue(hasLocalQueue, target, method, args, stack);
-        } else {
-          this.targetQueues[guid] = [
-            method,
-            this._queue.push(target, method, args, stack) - 4
-          ];
-        }
-
-        return {
-          queue: this,
-          target: target,
-          method: method
-        };
+        return {queue: this, target: target, method: method};
       },
 
       pushUnique: function(target, method, args, stack) {
         var queue = this._queue, currentTarget, currentMethod, i, l;
-        var KEY = this.globalOptions.GUID_KEY;
 
-        if (target && KEY) {
-          var guid = target[KEY];
-          if (guid) {
-            return this.pushUniqueWithGuid(guid, target, method, args, stack);
+        for (i = 0, l = queue.length; i < l; i += 4) {
+          currentTarget = queue[i];
+          currentMethod = queue[i+1];
+
+          if (currentTarget === target && currentMethod === method) {
+            queue[i+2] = args; // replace args
+            queue[i+3] = stack; // replace stack
+            return {queue: this, target: target, method: method};
           }
         }
 
-        this.pushUniqueWithoutGuid(target, method, args, stack);
-
-        return {
-          queue: this,
-          target: target,
-          method: method
-        };
+        queue.push(target, method, args, stack);
+        return {queue: this, target: target, method: method};
       },
 
       // TODO: remove me, only being used for Ember.run.sync
       flush: function() {
-        var queue = this._queue;
-        var globalOptions = this.globalOptions;
-        var options = this.options;
-        var before = options && options.before;
-        var after = options && options.after;
-        var onError = globalOptions.onError || (globalOptions.onErrorTarget && globalOptions.onErrorTarget[globalOptions.onErrorMethod]);
-        var target, method, args, stack, i, l = queue.length;
-
-        this.targetQueues = Object.create(null);
+        var queue = this._queue,
+            globalOptions = this.globalOptions,
+            options = this.options,
+            before = options && options.before,
+            after = options && options.after,
+            onError = globalOptions.onError || (globalOptions.onErrorTarget && globalOptions.onErrorTarget[globalOptions.onErrorMethod]),
+            target, method, args, stack, i, l = queue.length;
 
         if (l && before) { before(); }
         for (i = 0; i < l; i += 4) {
@@ -950,28 +810,12 @@ enifed("backburner/queue",
 
       cancel: function(actionToCancel) {
         var queue = this._queue, currentTarget, currentMethod, i, l;
-        var target = actionToCancel.target;
-        var method = actionToCancel.method;
-        var GUID_KEY = this.globalOptions.GUID_KEY;
-
-        if (GUID_KEY && this.targetQueues && target) {
-          var targetQueue = this.targetQueues[target[GUID_KEY]];
-
-          if (targetQueue) {
-            for (i = 0, l = targetQueue.length; i < l; i++) {
-              if (targetQueue[i] === method) {
-                targetQueue.splice(i, 1);
-              }
-            }
-          }
-        }
 
         for (i = 0, l = queue.length; i < l; i += 4) {
           currentTarget = queue[i];
           currentMethod = queue[i+1];
 
-          if (currentTarget === target &&
-              currentMethod === method) {
+          if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
             queue.splice(i, 4);
             return true;
           }
@@ -987,8 +831,7 @@ enifed("backburner/queue",
           currentTarget = queue[i];
           currentMethod = queue[i+1];
 
-          if (currentTarget === target &&
-              currentMethod === method) {
+          if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
             // don't mess with array during flush
             // just nullify the method
             queue[i+1] = null;
@@ -998,63 +841,44 @@ enifed("backburner/queue",
       }
     };
 
-    __exports__["default"] = Queue;
+    __exports__.Queue = Queue;
   });
-enifed("backburner/utils",
+define("backburner/utils",
   ["exports"],
   function(__exports__) {
     "use strict";
-    var NUMBER = /\d+/;
-
-    function each(collection, callback) {
-      for (var i = 0; i < collection.length; i++) {
-        callback(collection[i]);
-      }
-    }
-
-    __exports__.each = each;// Date.now is not available in browsers < IE9
-    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/now#Compatibility
-    var now = Date.now || function() { return new Date().getTime(); };
-    __exports__.now = now;
-    function isString(suspect) {
-      return typeof suspect === 'string';
-    }
-
-    __exports__.isString = isString;function isFunction(suspect) {
-      return typeof suspect === 'function';
-    }
-
-    __exports__.isFunction = isFunction;function isNumber(suspect) {
-      return typeof suspect === 'number';
-    }
-
-    __exports__.isNumber = isNumber;function isCoercableNumber(number) {
-      return isNumber(number) || NUMBER.test(number);
-    }
-
-    __exports__.isCoercableNumber = isCoercableNumber;function wrapInTryCatch(func) {
-      return function () {
-        try {
-          return func.apply(this, arguments);
-        } catch (e) {
-          throw e;
+    __exports__["default"] = {
+      each: function(collection, callback) {
+        for (var i = 0; i < collection.length; i++) {
+          callback(collection[i]);
         }
-      };
-    }
+      },
 
-    __exports__.wrapInTryCatch = wrapInTryCatch;
+      isString: function(suspect) {
+        return typeof suspect === 'string';
+      },
+
+      isFunction: function(suspect) {
+        return typeof suspect === 'function';
+      },
+
+      isNumber: function(suspect) {
+        return typeof suspect === 'number';
+      }
+    };
   });
-enifed("calculateVersion",
+
+define("calculateVersion",
   [],
   function() {
     "use strict";
     'use strict';
 
-    var fs   = eriuqer('fs');
-    var path = eriuqer('path');
+    var fs   = require('fs');
+    var path = require('path');
 
     module.exports = function () {
-      var packageVersion = eriuqer('../package.json').version;
+      var packageVersion = require('../package.json').version;
       var output         = [packageVersion];
       var gitPath        = path.join(__dirname,'..','.git');
       var headFilePath   = path.join(gitPath, 'HEAD');
@@ -1085,7 +909,7 @@ enifed("calculateVersion",
       }
     };
   });
-enifed("container",
+define("container",
   ["container/container","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -1112,14 +936,13 @@ enifed("container",
 
     __exports__["default"] = Container;
   });
-enifed("container/container",
-  ["ember-metal/core","ember-metal/keys","ember-metal/dictionary","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+define("container/container",
+  ["container/inheriting_dict","ember-metal/core","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
+    var InheritingDict = __dependency1__["default"];
+    var Ember = __dependency2__["default"];
     // Ember.assert
-    var emberKeys = __dependency2__["default"];
-    var dictionary = __dependency3__["default"];
 
     // A lightweight container that helps to assemble and decouple components.
     // Public api for the container is still in flux.
@@ -1130,19 +953,18 @@ enifed("container/container",
 
       this.resolver = parent && parent.resolver || function() {};
 
-      this.registry       = dictionary(parent ? parent.registry : null);
-      this.cache          = dictionary(parent ? parent.cache : null);
-      this.factoryCache   = dictionary(parent ? parent.factoryCache : null);
-      this.resolveCache   = dictionary(parent ? parent.resolveCache : null);
-      this.typeInjections = dictionary(parent ? parent.typeInjections : null);
-      this.injections     = dictionary(null);
-      this.normalizeCache = dictionary(null);
+      this.registry = new InheritingDict(parent && parent.registry);
+      this.cache = new InheritingDict(parent && parent.cache);
+      this.factoryCache = new InheritingDict(parent && parent.factoryCache);
+      this.resolveCache = new InheritingDict(parent && parent.resolveCache);
+      this.typeInjections = new InheritingDict(parent && parent.typeInjections);
+      this.injections = {};
 
-      this.factoryTypeInjections = dictionary(parent ? parent.factoryTypeInjections : null);
-      this.factoryInjections     = dictionary(null);
+      this.factoryTypeInjections = new InheritingDict(parent && parent.factoryTypeInjections);
+      this.factoryInjections = {};
 
-      this._options     = dictionary(parent ? parent._options : null);
-      this._typeOptions = dictionary(parent ? parent._typeOptions : null);
+      this._options = new InheritingDict(parent && parent._options);
+      this._typeOptions = new InheritingDict(parent && parent._typeOptions);
     }
 
     Container.prototype = {
@@ -1263,12 +1085,12 @@ enifed("container/container",
 
         var normalizedName = this.normalize(fullName);
 
-        if (normalizedName in this.cache) {
+        if (this.cache.has(normalizedName)) {
           throw new Error('Cannot re-register: `' + fullName +'`, as it has already been looked up.');
         }
 
-        this.registry[normalizedName] = factory;
-        this._options[normalizedName] = (options || {});
+        this.registry.set(normalizedName, factory);
+        this._options.set(normalizedName, options || {});
       },
 
       /**
@@ -1292,11 +1114,11 @@ enifed("container/container",
 
         var normalizedName = this.normalize(fullName);
 
-        delete this.registry[normalizedName];
-        delete this.cache[normalizedName];
-        delete this.factoryCache[normalizedName];
-        delete this.resolveCache[normalizedName];
-        delete this._options[normalizedName];
+        this.registry.remove(normalizedName);
+        this.cache.remove(normalizedName);
+        this.factoryCache.remove(normalizedName);
+        this.resolveCache.remove(normalizedName);
+        this._options.remove(normalizedName);
       },
 
       /**
@@ -1355,25 +1177,12 @@ enifed("container/container",
       /**
         A hook to enable custom fullName normalization behaviour
 
-        @method normalizeFullName
-        @param {String} fullName
-        @return {string} normalized fullName
-      */
-      normalizeFullName: function(fullName) {
-        return fullName;
-      },
-
-      /**
-        normalize a fullName based on the applications conventions
-
         @method normalize
         @param {String} fullName
         @return {string} normalized fullName
       */
       normalize: function(fullName) {
-        return this.normalizeCache[fullName] || (
-          this.normalizeCache[fullName] = this.normalizeFullName(fullName)
-        );
+        return fullName;
       },
 
       /**
@@ -1486,7 +1295,7 @@ enifed("container/container",
       optionsForType: function(type, options) {
         if (this.parent) { illegalChildOperation('optionsForType'); }
 
-        this._typeOptions[type] = options;
+        this._typeOptions.set(type, options);
       },
 
       /**
@@ -1535,14 +1344,12 @@ enifed("container/container",
       */
       typeInjection: function(type, property, fullName) {
         Ember.assert('fullName must be a proper full name', validateFullName(fullName));
-
         if (this.parent) { illegalChildOperation('typeInjection'); }
 
         var fullNameType = fullName.split(':')[0];
-        if (fullNameType === type) {
+        if(fullNameType === type) {
           throw new Error('Cannot inject a `' + fullName + '` on other ' + type + '(s). Register the `' + fullName + '` as a different type and perform the typeInjection.');
         }
-
         addTypeInjection(this.typeInjections, type, property, fullName);
       },
 
@@ -1603,7 +1410,7 @@ enifed("container/container",
         Ember.assert('fullName must be a proper full name', validateFullName(fullName));
         var normalizedName = this.normalize(fullName);
 
-        if (this.cache[normalizedName]) {
+        if (this.cache.has(normalizedName)) {
           throw new Error("Attempted to register an injection for a type that has already been looked up. ('" + normalizedName + "', '" + property + "', '" + injectionName + "')");
         }
         addInjection(this.injections, normalizedName, property, normalizedInjectionName);
@@ -1708,7 +1515,7 @@ enifed("container/container",
 
         Ember.assert('fullName must be a proper full name', validateFullName(fullName));
 
-        if (this.factoryCache[normalizedName]) {
+        if (this.factoryCache.has(normalizedName)) {
           throw new Error('Attempted to register a factoryInjection for a type that has already ' +
             'been looked up. (\'' + normalizedName + '\', \'' + property + '\', \'' + injectionName + '\')');
         }
@@ -1750,17 +1557,17 @@ enifed("container/container",
     };
 
     function resolve(container, normalizedName) {
-      var cached = container.resolveCache[normalizedName];
+      var cached = container.resolveCache.get(normalizedName);
       if (cached) { return cached; }
 
-      var resolved = container.resolver(normalizedName) || container.registry[normalizedName];
-      container.resolveCache[normalizedName] = resolved;
+      var resolved = container.resolver(normalizedName) || container.registry.get(normalizedName);
+      container.resolveCache.set(normalizedName, resolved);
 
       return resolved;
     }
 
     function has(container, fullName){
-      if (container.cache[fullName]) {
+      if (container.cache.has(fullName)) {
         return true;
       }
 
@@ -1770,8 +1577,8 @@ enifed("container/container",
     function lookup(container, fullName, options) {
       options = options || {};
 
-      if (container.cache[fullName] && options.singleton !== false) {
-        return container.cache[fullName];
+      if (container.cache.has(fullName) && options.singleton !== false) {
+        return container.cache.get(fullName);
       }
 
       var value = instantiate(container, fullName);
@@ -1779,7 +1586,7 @@ enifed("container/container",
       if (value === undefined) { return; }
 
       if (isSingleton(container, fullName) && options.singleton !== false) {
-        container.cache[fullName] = value;
+        container.cache.set(fullName, value);
       }
 
       return value;
@@ -1817,14 +1624,14 @@ enifed("container/container",
     }
 
     function option(container, fullName, optionName) {
-      var options = container._options[fullName];
+      var options = container._options.get(fullName);
 
       if (options && options[optionName] !== undefined) {
         return options[optionName];
       }
 
       var type = fullName.split(':')[0];
-      options = container._typeOptions[type];
+      options = container._typeOptions.get(type);
 
       if (options) {
         return options[optionName];
@@ -1833,8 +1640,8 @@ enifed("container/container",
 
     function factoryFor(container, fullName) {
       var cache = container.factoryCache;
-      if (cache[fullName]) {
-        return cache[fullName];
+      if (cache.has(fullName)) {
+        return cache.get(fullName);
       }
       var factory = container.resolve(fullName);
       if (factory === undefined) { return; }
@@ -1843,7 +1650,6 @@ enifed("container/container",
       if (!factory || typeof factory.extend !== 'function' || (!Ember.MODEL_FACTORY_INJECTIONS && type === 'model')) {
         // TODO: think about a 'safe' merge style extension
         // for now just fallback to create time injection
-        cache[fullName] = factory;
         return factory;
       } else {
         var injections = injectionsFor(container, fullName);
@@ -1854,18 +1660,18 @@ enifed("container/container",
         var injectedFactory = factory.extend(injections);
         injectedFactory.reopenClass(factoryInjections);
 
-        cache[fullName] = injectedFactory;
+        cache.set(fullName, injectedFactory);
 
         return injectedFactory;
       }
     }
 
     function injectionsFor(container, fullName) {
-      var splitName = fullName.split(':');
-      var type = splitName[0];
-      var injections = [];
+      var splitName = fullName.split(':'),
+        type = splitName[0],
+        injections = [];
 
-      injections = injections.concat(container.typeInjections[type] || []);
+      injections = injections.concat(container.typeInjections.get(type) || []);
       injections = injections.concat(container.injections[fullName] || []);
 
       injections = buildInjections(container, injections);
@@ -1876,11 +1682,11 @@ enifed("container/container",
     }
 
     function factoryInjectionsFor(container, fullName) {
-      var splitName = fullName.split(':');
-      var type = splitName[0];
-      var factoryInjections = [];
+      var splitName = fullName.split(':'),
+        type = splitName[0],
+        factoryInjections = [];
 
-      factoryInjections = factoryInjections.concat(container.factoryTypeInjections[type] || []);
+      factoryInjections = factoryInjections.concat(container.factoryTypeInjections.get(type) || []);
       factoryInjections = factoryInjections.concat(container.factoryInjections[fullName] || []);
 
       factoryInjections = buildInjections(container, factoryInjections);
@@ -1915,34 +1721,26 @@ enifed("container/container",
     }
 
     function eachDestroyable(container, callback) {
-      var cache = container.cache;
-      var keys = emberKeys(cache);
-      var key, value;
-
-      for (var i = 0, l = keys.length; i < l; i++) {
-        key = keys[i];
-        value = cache[key];
-
-        if (option(container, key, 'instantiate') !== false) {
-          callback(value);
-        }
-      }
+      container.cache.eachLocal(function(key, value) {
+        if (option(container, key, 'instantiate') === false) { return; }
+        callback(value);
+      });
     }
 
     function resetCache(container) {
-      eachDestroyable(container, function(value) {
+      container.cache.eachLocal(function(key, value) {
+        if (option(container, key, 'instantiate') === false) { return; }
         value.destroy();
       });
-
-      container.cache.dict = dictionary(null);
+      container.cache.dict = {};
     }
 
     function addTypeInjection(rules, type, property, fullName) {
-      var injections = rules[type];
+      var injections = rules.get(type);
 
       if (!injections) {
         injections = [];
-        rules[type] = injections;
+        rules.set(type, injections);
       }
 
       injections.push({
@@ -1961,15 +1759,126 @@ enifed("container/container",
 
     function addInjection(rules, factoryName, property, injectionName) {
       var injections = rules[factoryName] = rules[factoryName] || [];
-      injections.push({
-        property: property,
-        fullName: injectionName
-      });
+      injections.push({ property: property, fullName: injectionName });
     }
 
     __exports__["default"] = Container;
   });
-enifed("ember-application",
+define("container/inheriting_dict",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    // A safe and simple inheriting object.
+    function InheritingDict(parent) {
+      this.parent = parent;
+      this.dict = {};
+    }
+
+    InheritingDict.prototype = {
+
+      /**
+        @property parent
+        @type InheritingDict
+        @default null
+      */
+
+      parent: null,
+
+      /**
+        Object used to store the current nodes data.
+
+        @property dict
+        @type Object
+        @default Object
+      */
+      dict: null,
+
+      /**
+        Retrieve the value given a key, if the value is present at the current
+        level use it, otherwise walk up the parent hierarchy and try again. If
+        no matching key is found, return undefined.
+
+        @method get
+        @param {String} key
+        @return {any}
+      */
+      get: function(key) {
+        var dict = this.dict;
+
+        if (dict.hasOwnProperty(key)) {
+          return dict[key];
+        }
+
+        if (this.parent) {
+          return this.parent.get(key);
+        }
+      },
+
+      /**
+        Set the given value for the given key, at the current level.
+
+        @method set
+        @param {String} key
+        @param {Any} value
+      */
+      set: function(key, value) {
+        this.dict[key] = value;
+      },
+
+      /**
+        Delete the given key
+
+        @method remove
+        @param {String} key
+      */
+      remove: function(key) {
+        delete this.dict[key];
+      },
+
+      /**
+        Check for the existence of given a key, if the key is present at the current
+        level return true, otherwise walk up the parent hierarchy and try again. If
+        no matching key is found, return false.
+
+        @method has
+        @param {String} key
+        @return {Boolean}
+      */
+      has: function(key) {
+        var dict = this.dict;
+
+        if (dict.hasOwnProperty(key)) {
+          return true;
+        }
+
+        if (this.parent) {
+          return this.parent.has(key);
+        }
+
+        return false;
+      },
+
+      /**
+        Iterate and invoke a callback for each local key-value pair.
+
+        @method eachLocal
+        @param {Function} callback
+        @param {Object} binding
+      */
+      eachLocal: function(callback, binding) {
+        var dict = this.dict;
+
+        for (var prop in dict) {
+          if (dict.hasOwnProperty(prop)) {
+            callback.call(binding, prop, dict[prop]);
+          }
+        }
+      }
+    };
+
+    __exports__["default"] = InheritingDict;
+  });
+define("ember-application",
   ["ember-metal/core","ember-runtime/system/lazy_load","ember-application/system/dag","ember-application/system/resolver","ember-application/system/application","ember-application/ext/controller"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
     "use strict";
@@ -1997,7 +1906,7 @@ enifed("ember-application",
 
     runLoadHooks('Ember.Application', Application);
   });
-enifed("ember-application/ext/controller",
+define("ember-application/ext/controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/error","ember-metal/utils","ember-metal/computed","ember-runtime/mixins/controller","ember-routing/system/controller_for","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -2018,8 +1927,7 @@ enifed("ember-application/ext/controller",
     var controllerFor = __dependency8__["default"];
 
     function verifyNeedsDependencies(controller, container, needs) {
-      var dependency, i, l;
-      var missing = [];
+      var dependency, i, l, missing = [];
 
       for (i=0, l=needs.length; i<l; i++) {
         dependency = needs[i];
@@ -2047,9 +1955,8 @@ enifed("ember-application/ext/controller",
         needs: get(controller, 'needs'),
         container: get(controller, 'container'),
         unknownProperty: function(controllerName) {
-          var needs = this.needs;
-          var dependency, i, l;
-
+          var needs = this.needs,
+            dependency, i, l;
           for (i=0, l=needs.length; i<l; i++) {
             dependency = needs[i];
             if (dependency === controllerName) {
@@ -2177,9 +2084,9 @@ enifed("ember-application/ext/controller",
 
     __exports__["default"] = ControllerMixin;
   });
-enifed("ember-application/system/application",
-  ["ember-metal","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-application/system/dag","ember-runtime/system/namespace","ember-runtime/mixins/deferred","ember-application/system/resolver","ember-metal/platform","ember-metal/run_loop","ember-metal/utils","container/container","ember-runtime/controllers/controller","ember-metal/enumerable_utils","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-handlebars/controls/select","ember-views/system/event_dispatcher","ember-views/system/jquery","ember-routing/system/route","ember-routing/system/router","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/location/none_location","ember-routing/system/cache","ember-metal/core","ember-handlebars-compiler","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __exports__) {
+define("ember-application/system/application",
+  ["ember-metal","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-application/system/dag","ember-runtime/system/namespace","ember-runtime/mixins/deferred","ember-application/system/resolver","ember-metal/platform","ember-metal/run_loop","ember-metal/utils","container/container","ember-runtime/controllers/controller","ember-metal/enumerable_utils","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-views/system/event_dispatcher","ember-views/system/jquery","ember-routing/system/route","ember-routing/system/router","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/location/none_location","ember-routing/system/cache","ember-metal/core","ember-handlebars-compiler","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -2203,31 +2110,21 @@ enifed("ember-application/system/application",
     var EnumerableUtils = __dependency14__["default"];
     var ObjectController = __dependency15__["default"];
     var ArrayController = __dependency16__["default"];
-    var SelectView = __dependency17__["default"];
-    var EventDispatcher = __dependency18__["default"];
+    var EventDispatcher = __dependency17__["default"];
     //import ContainerDebugAdapter from "ember-extension-support/container_debug_adapter";
-    var jQuery = __dependency19__["default"];
-    var Route = __dependency20__["default"];
-    var Router = __dependency21__["default"];
-    var HashLocation = __dependency22__["default"];
-    var HistoryLocation = __dependency23__["default"];
-    var AutoLocation = __dependency24__["default"];
-    var NoneLocation = __dependency25__["default"];
-    var BucketCache = __dependency26__["default"];
+    var jQuery = __dependency18__["default"];
+    var Route = __dependency19__["default"];
+    var Router = __dependency20__["default"];
+    var HashLocation = __dependency21__["default"];
+    var HistoryLocation = __dependency22__["default"];
+    var AutoLocation = __dependency23__["default"];
+    var NoneLocation = __dependency24__["default"];
+    var BucketCache = __dependency25__["default"];
 
-    var K = __dependency27__.K;
-    var EmberHandlebars = __dependency28__["default"];
+    var K = __dependency26__.K;
+    var EmberHandlebars = __dependency27__["default"];
 
     var ContainerDebugAdapter;
-    function props(obj) {
-      var properties = [];
-
-      for (var key in obj) {
-        properties.push(key);
-      }
-
-      return properties;
-    }
 
     /**
       An instance of `Ember.Application` is the starting point for every Ember
@@ -2447,7 +2344,7 @@ enifed("ember-application/system/application",
 
         this.scheduleInitialize();
 
-        Ember.libraries.registerCoreLibrary('Handlebars' + (EmberHandlebars.compile ? '' : '-runtime'), EmberHandlebars.VERSION);
+        Ember.libraries.registerCoreLibrary('Handlebars', EmberHandlebars.VERSION);
         Ember.libraries.registerCoreLibrary('jQuery', jQuery().jquery);
 
         if ( Ember.LOG_VERSION ) {
@@ -2844,21 +2741,20 @@ enifed("ember-application/system/application",
         @method runInitializers
       */
       runInitializers: function() {
-        var initializersByName = get(this.constructor, 'initializers');
-        var initializers = props(initializersByName);
+        var initializers = get(this.constructor, 'initializers');
         var container = this.__container__;
         var graph = new DAG();
         var namespace = this;
         var name, initializer;
 
-        for (var i = 0; i < initializers.length; i++) {
-          initializer = initializersByName[initializers[i]];
+        for (name in initializers) {
+          initializer = initializers[name];
           graph.addEdges(initializer.name, initializer.initialize, initializer.before, initializer.after);
         }
 
         graph.topsort(function (vertex) {
           var initializer = vertex.value;
-          Ember.assert("No application initializer named '" + vertex.name + "'", initializer);
+          Ember.assert("No application initializer named '"+vertex.name+"'", initializer);
           initializer(container, namespace);
         });
       },
@@ -2968,7 +2864,7 @@ enifed("ember-application/system/application",
     });
 
     Application.reopenClass({
-      initializers: create(null),
+      initializers: {},
 
       /**
         Initializer receives an object which has the following attributes:
@@ -3136,9 +3032,9 @@ enifed("ember-application/system/application",
         var container = new Container();
 
         container.set = set;
-        container.resolver = resolverFor(namespace);
-        container.normalizeFullName = container.resolver.normalize;
-        container.describe = container.resolver.describe;
+        container.resolver  = resolverFor(namespace);
+        container.normalize = container.resolver.normalize;
+        container.describe  = container.resolver.describe;
         container.makeToString = container.resolver.makeToString;
 
         container.optionsForType('component', { singleton: false });
@@ -3151,9 +3047,6 @@ enifed("ember-application/system/application",
         container.register('controller:basic', Controller, { instantiate: false });
         container.register('controller:object', ObjectController, { instantiate: false });
         container.register('controller:array', ArrayController, { instantiate: false });
-
-        container.register('view:select', SelectView);
-
         container.register('route:basic', Route, { instantiate: false });
         container.register('event_dispatcher:main', EventDispatcher);
 
@@ -3244,7 +3137,7 @@ enifed("ember-application/system/application",
 
     __exports__["default"] = Application;
   });
-enifed("ember-application/system/dag",
+define("ember-application/system/dag",
   ["ember-metal/error","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -3287,22 +3180,7 @@ enifed("ember-application/system/dag",
      */
     function DAG() {
       this.names = [];
-      this.vertices = Object.create(null);
-    }
-
-    /**
-     * DAG Vertex
-     *
-     * @class Vertex
-     * @constructor
-     */
-
-    function Vertex(name) {
-      this.name = name;
-      this.incoming = {};
-      this.incomingNames = [];
-      this.hasOutgoing = false;
-      this.value = null;
+      this.vertices = {};
     }
 
     /**
@@ -3313,13 +3191,13 @@ enifed("ember-application/system/dag",
      * @param {String} name The name of the vertex to add
      */
     DAG.prototype.add = function(name) {
-      if (!name) {
-        throw new Error("Can't add Vertex without name");
-      }
-      if (this.vertices[name] !== undefined) {
+      if (!name) { return; }
+      if (this.vertices.hasOwnProperty(name)) {
         return this.vertices[name];
       }
-      var vertex = new Vertex(name);
+      var vertex = {
+        name: name, incoming: {}, incomingNames: [], hasOutgoing: false, value: null
+      };
       this.vertices[name] = vertex;
       this.names.push(name);
       return vertex;
@@ -3339,7 +3217,7 @@ enifed("ember-application/system/dag",
 
     /**
      * Connects the vertices with the given names, adding them to the graph if
-     * necessary, only if this does not produce is any circular dependency.
+     * necesary, only if this does not produce is any circular dependency.
      *
      * @private
      * @method addEdge
@@ -3350,8 +3228,7 @@ enifed("ember-application/system/dag",
       if (!fromName || !toName || fromName === toName) {
         return;
       }
-      var from = this.add(fromName);
-      var to = this.add(toName);
+      var from = this.add(fromName), to = this.add(toName);
       if (to.incoming.hasOwnProperty(fromName)) {
         return;
       }
@@ -3430,9 +3307,9 @@ enifed("ember-application/system/dag",
 
     __exports__["default"] = DAG;
   });
-enifed("ember-application/system/resolver",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/logger","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/system/namespace","ember-handlebars","ember-metal/dictionary","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+define("ember-application/system/resolver",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/logger","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/system/namespace","ember-handlebars","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -3537,7 +3414,6 @@ enifed("ember-application/system/resolver",
       @namespace Ember
       @extends Ember.Object
     */
-    var dictionary = __dependency8__["default"];
 
     __exports__["default"] = EmberObject.extend({
       /**
@@ -3548,13 +3424,10 @@ enifed("ember-application/system/resolver",
       */
       namespace: null,
 
-      init: function() {
-        this._parseNameCache = dictionary(null);
-      },
       normalize: function(fullName) {
-        var split = fullName.split(':', 2);
-        var type = split[0];
-        var name = split[1];
+        var split = fullName.split(':', 2),
+            type = split[0],
+            name = split[1];
 
         Ember.assert("Tried to normalize a container name without a colon (:) in it. You probably tried to lookup a name that did not contain a type, a colon, and a name. A proper lookup name would be `view:post`.", split.length === 2);
 
@@ -3562,15 +3435,11 @@ enifed("ember-application/system/resolver",
           var result = name;
 
           if (result.indexOf('.') > -1) {
-            result = result.replace(/\.(.)/g, function(m) {
-              return m.charAt(1).toUpperCase();
-            });
+            result = result.replace(/\.(.)/g, function(m) { return m.charAt(1).toUpperCase(); });
           }
 
           if (name.indexOf('_') > -1) {
-            result = result.replace(/_(.)/g, function(m) {
-              return m.charAt(1).toUpperCase();
-            });
+            result = result.replace(/_(.)/g, function(m) { return m.charAt(1).toUpperCase(); });
           }
 
           return type + ':' + result;
@@ -3590,9 +3459,9 @@ enifed("ember-application/system/resolver",
         @return {Object} the resolved factory
       */
       resolve: function(fullName) {
-        var parsedName = this.parseName(fullName);
-        var resolveMethodName = parsedName.resolveMethodName;
-        var resolved;
+        var parsedName = this.parseName(fullName),
+            resolveMethodName = parsedName.resolveMethodName,
+            resolved;
 
         if (!(parsedName.name && parsedName.type)) {
           throw new TypeError('Invalid fullName: `' + fullName + '`, must be of the form `type:name` ');
@@ -3621,19 +3490,12 @@ enifed("ember-application/system/resolver",
         @param {String} fullName the lookup string
         @method parseName
       */
-
       parseName: function(fullName) {
-        return this._parseNameCache[fullName] || (
-          this._parseNameCache[fullName] = this._parseName(fullName)
-        );
-      },
-
-      _parseName: function(fullName) {
-        var nameParts = fullName.split(':');
-        var type = nameParts[0], fullNameWithoutType = nameParts[1];
-        var name = fullNameWithoutType;
-        var namespace = get(this, 'namespace');
-        var root = namespace;
+        var nameParts = fullName.split(':'),
+            type = nameParts[0], fullNameWithoutType = nameParts[1],
+            name = fullNameWithoutType,
+            namespace = get(this, 'namespace'),
+            root = namespace;
 
         if (type !== 'template' && name.indexOf('/') !== -1) {
           var parts = name.split('/');
@@ -3672,10 +3534,7 @@ enifed("ember-application/system/resolver",
         }
 
         var description = parsedName.root + '.' + classify(parsedName.name);
-
-        if (parsedName.type !== 'model') {
-          description += classify(parsedName.type);
-        }
+        if (parsedName.type !== 'model') { description += classify(parsedName.type); }
 
         return description;
       },
@@ -3718,7 +3577,6 @@ enifed("ember-application/system/resolver",
           return Ember.TEMPLATES[templateName];
         }
       },
-
       /**
         Lookup the view using `resolveOther`
 
@@ -3731,7 +3589,6 @@ enifed("ember-application/system/resolver",
         this.useRouterNaming(parsedName);
         return this.resolveOther(parsedName);
       },
-
       /**
         Lookup the controller using `resolveOther`
 
@@ -3820,7 +3677,7 @@ enifed("ember-application/system/resolver",
       }
     });
   });
-enifed("ember-debug",
+define("ember-debug",
   ["ember-metal/core","ember-metal/error","ember-metal/logger"],
   function(__dependency1__, __dependency2__, __dependency3__) {
     "use strict";
@@ -3919,9 +3776,7 @@ enifed("ember-debug",
       try { __fail__.fail(); } catch (e) { error = e; }
 
       if (Ember.LOG_STACKTRACE_ON_DEPRECATION && error.stack) {
-        var stack;
-        var stackStr = '';
-
+        var stack, stackStr = '';
         if (error['arguments']) {
           // Chrome
           stack = error.stack.replace(/^\s+at\s+/gm, '').
@@ -4013,7 +3868,7 @@ enifed("ember-debug",
       }
     }
   });
-enifed("ember-extension-support",
+define("ember-extension-support",
   ["ember-metal/core","ember-extension-support/data_adapter","ember-extension-support/container_debug_adapter"],
   function(__dependency1__, __dependency2__, __dependency3__) {
     "use strict";
@@ -4032,7 +3887,7 @@ enifed("ember-extension-support",
     Ember.DataAdapter = DataAdapter;
     Ember.ContainerDebugAdapter = ContainerDebugAdapter;
   });
-enifed("ember-extension-support/container_debug_adapter",
+define("ember-extension-support/container_debug_adapter",
   ["ember-metal/core","ember-runtime/system/native_array","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/namespace","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -4109,7 +3964,7 @@ enifed("ember-extension-support/container_debug_adapter",
         classes in the resolver for a given type.
 
         @method canCatalogEntriesByType
-        @param {String} type The type. e.g. "model", "controller", "route"
+        @param {string} type The type. e.g. "model", "controller", "route"
         @return {boolean} whether a list is available for this type.
       */
       canCatalogEntriesByType: function(type) {
@@ -4121,7 +3976,7 @@ enifed("ember-extension-support/container_debug_adapter",
         Returns the available classes a given type.
 
         @method catalogEntriesByType
-        @param {String} type The type. e.g. "model", "controller", "route"
+        @param {string} type The type. e.g. "model", "controller", "route"
         @return {Array} An array of strings.
       */
       catalogEntriesByType: function(type) {
@@ -4145,7 +4000,7 @@ enifed("ember-extension-support/container_debug_adapter",
       }
     });
   });
-enifed("ember-extension-support/data_adapter",
+define("ember-extension-support/data_adapter",
   ["ember-metal/core","ember-metal/property_get","ember-metal/run_loop","ember-runtime/system/string","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/native_array","ember-application/system/application","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -4283,10 +4138,8 @@ enifed("ember-extension-support/data_adapter",
         @return {Function} Method to call to remove all observers
       */
       watchModelTypes: function(typesAdded, typesUpdated) {
-        var modelTypes = this.getModelTypes();
-        var self = this;
-        var releaseMethods = emberA();
-        var typesToSend;
+        var modelTypes = this.getModelTypes(),
+            self = this, typesToSend, releaseMethods = emberA();
 
         typesToSend = modelTypes.map(function(type) {
           var klass = type.klass;
@@ -4427,8 +4280,7 @@ enifed("ember-extension-support/data_adapter",
       */
 
       observeModelType: function(type, typesUpdated) {
-        var self = this;
-        var records = this.getRecords(type);
+        var self = this, records = this.getRecords(type);
 
         var onChange = function() {
           typesUpdated([self.wrapModelType(type)]);
@@ -4468,9 +4320,8 @@ enifed("ember-extension-support/data_adapter",
           release: {Function} The function to remove observers
       */
       wrapModelType: function(type, name) {
-        var records = this.getRecords(type);
-        var self = this;
-        var release, typeToSend;
+        var release, records = this.getRecords(type),
+            typeToSend, self = this;
 
         typeToSend = {
           name: name || type.toString(),
@@ -4492,9 +4343,8 @@ enifed("ember-extension-support/data_adapter",
         @return {Array} Array of model types
       */
       getModelTypes: function() {
-        var self = this;
-        var containerDebugAdapter = this.get('containerDebugAdapter');
-        var types;
+        var types, self = this,
+            containerDebugAdapter = this.get('containerDebugAdapter');
 
         if (containerDebugAdapter.canCatalogEntriesByType('model')) {
           types = containerDebugAdapter.catalogEntriesByType('model');
@@ -4525,9 +4375,9 @@ enifed("ember-extension-support/data_adapter",
         @return {Array} Array of model type strings
       */
       _getObjectsOnNamespaces: function() {
-        var namespaces = emberA(Namespace.NAMESPACES);
-        var types = emberA();
-        var self = this;
+        var namespaces = emberA(Namespace.NAMESPACES),
+            types = emberA(),
+            self = this;
 
         namespaces.forEach(function(namespace) {
           for (var key in namespace) {
@@ -4570,9 +4420,7 @@ enifed("ember-extension-support/data_adapter",
         searchKeywords: {Array}
       */
       wrapRecord: function(record) {
-        var recordToSend = { object: record };
-        var columnValues = {};
-        var self = this;
+        var recordToSend = { object: record }, columnValues = {}, self = this;
 
         recordToSend.columnValues = this.getRecordColumnValues(record);
         recordToSend.searchKeywords = this.getRecordKeywords(record);
@@ -4645,21 +4493,17 @@ enifed("ember-extension-support/data_adapter",
       }
     });
   });
-enifed("ember-extension-support/initializers",
+define("ember-extension-support/initializers",
   [],
   function() {
     "use strict";
 
   });
-enifed("ember-handlebars-compiler",
+define("ember-handlebars-compiler",
   ["ember-metal/core","exports"],
   function(__dependency1__, __exports__) {
-        /* global Handlebars:true */
-
-    // Remove "use strict"; from transpiled module (in browser builds only) until
-    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
-    //
-    // REMOVE_USE_STRICT: true
+    "use strict";
+    /* global Handlebars:true */
 
     /**
     @module ember
@@ -4684,8 +4528,8 @@ enifed("ember-handlebars-compiler",
     // ES6Todo: when ember-debug is es6'ed import this.
     // var emberAssert = Ember.assert;
     var Handlebars = (Ember.imports && Ember.imports.Handlebars) || (this && this.Handlebars);
-    if (!Handlebars && typeof eriuqer === 'function') {
-      Handlebars = eriuqer('handlebars');
+    if (!Handlebars && typeof require === 'function') {
+      Handlebars = require('handlebars');
     }
 
     Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1. Include " +
@@ -4754,7 +4598,7 @@ enifed("ember-handlebars-compiler",
       Which is functionally equivalent to:
 
       ```handlebars
-      {{view 'calendar'}}
+      {{view App.CalendarView}}
       ```
 
       Options in the helper will be passed to the view in exactly the same
@@ -4867,14 +4711,14 @@ enifed("ember-handlebars-compiler",
     // This can go away once the following is closed:
     // https://github.com/wycats/handlebars.js/issues/634
 
-    var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/;
-    var BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/;
-    var INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
+    var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/,
+        BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/,
+        INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
 
     EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation = function(source) {
-      var helperInvocation = source[source.length - 1];
-      var helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1];
-      var matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);
+      var helperInvocation = source[source.length - 1],
+          helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1],
+          matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);
 
       source[source.length - 1] = matches[1] + "'" + helperName + "'" + matches[3];
     };
@@ -4927,12 +4771,12 @@ enifed("ember-handlebars-compiler",
       @method precompile
       @for Ember.Handlebars
       @static
-      @param {String|Object} value The template to precompile or an Handlebars AST
+      @param {String} string The template to precompile
       @param {Boolean} asObject optional parameter, defaulting to true, of whether or not the
                                 compiled template should be returned as an Object or a String
     */
-    EmberHandlebars.precompile = function(value, asObject) {
-      var ast = Handlebars.parse(value);
+    EmberHandlebars.precompile = function(string, asObject) {
+      var ast = Handlebars.parse(string);
 
       var options = {
         knownHelpers: {
@@ -4981,7 +4825,7 @@ enifed("ember-handlebars-compiler",
 
     __exports__["default"] = EmberHandlebars;
   });
-enifed("ember-handlebars",
+define("ember-handlebars",
   ["ember-handlebars-compiler","ember-metal/core","ember-runtime/system/lazy_load","ember-handlebars/loader","ember-handlebars/ext","ember-handlebars/string","ember-handlebars/helpers/shared","ember-handlebars/helpers/binding","ember-handlebars/helpers/collection","ember-handlebars/helpers/view","ember-handlebars/helpers/unbound","ember-handlebars/helpers/debug","ember-handlebars/helpers/each","ember-handlebars/helpers/template","ember-handlebars/helpers/partial","ember-handlebars/helpers/yield","ember-handlebars/helpers/loc","ember-handlebars/controls/checkbox","ember-handlebars/controls/select","ember-handlebars/controls/text_area","ember-handlebars/controls/text_field","ember-handlebars/controls/text_support","ember-handlebars/controls","ember-handlebars/component_lookup","ember-handlebars/views/handlebars_bound_view","ember-handlebars/views/metamorph_view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __exports__) {
     "use strict";
@@ -5132,7 +4976,7 @@ enifed("ember-handlebars",
 
     __exports__["default"] = EmberHandlebars;
   });
-enifed("ember-handlebars/component_lookup",
+define("ember-handlebars/component_lookup",
   ["ember-runtime/system/object","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -5143,9 +4987,9 @@ enifed("ember-handlebars/component_lookup",
 
         container = container || this.container;
 
-        var fullName = 'component:' + name;
-        var templateFullName = 'template:components/' + name;
-        var templateRegistered = container && container.has(templateFullName);
+        var fullName = 'component:' + name,
+            templateFullName = 'template:components/' + name,
+            templateRegistered = container && container.has(templateFullName);
 
         if (templateRegistered) {
           container.injection(fullName, 'layout', templateFullName);
@@ -5167,7 +5011,7 @@ enifed("ember-handlebars/component_lookup",
 
     __exports__["default"] = ComponentLookup;
   });
-enifed("ember-handlebars/controls",
+define("ember-handlebars/controls",
   ["ember-handlebars/controls/checkbox","ember-handlebars/controls/text_field","ember-handlebars/controls/text_area","ember-metal/core","ember-handlebars-compiler","ember-handlebars/ext","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -5258,7 +5102,7 @@ enifed("ember-handlebars/controls",
 
       The helper can send multiple actions based on user events.
 
-      The action property defines the action which is sent when
+      The action property defines the action which is send when
       the user presses the return key.
 
       ```handlebars
@@ -5274,7 +5118,6 @@ enifed("ember-handlebars/controls",
     * `focus-out`
     * `key-press`
 
-
       For example, if you desire an action to be sent when the input is blurred,
       you only need to setup the action name to the event name property.
 
@@ -5374,10 +5217,10 @@ enifed("ember-handlebars/controls",
     function inputHelper(options) {
       Ember.assert('You can only pass attributes to the `input` helper, not arguments', arguments.length < 2);
 
-      var hash = options.hash;
-      var types = options.hashTypes;
-      var inputType = _resolveOption(this, options, 'type');
-      var onEvent = hash.on;
+      var hash = options.hash,
+          types = options.hashTypes,
+          inputType = _resolveOption(this, options, 'type'),
+          onEvent = hash.on;
 
       if (inputType === 'checkbox') {
         delete hash.type;
@@ -5557,7 +5400,7 @@ enifed("ember-handlebars/controls",
       Internally, `{{textarea}}` creates an instance of `Ember.TextArea`, passing
       arguments from the helper to `Ember.TextArea`'s `create` method. You can
       extend the capabilities of text areas in your application by reopening this
-      class. For example, if you are building a Bootstrap project where `data-*`
+      class. For example, if you are building a Bootstrap project where `data-*` 
       attributes are used, you can globally add support for a `data-*` attribute
       on all `{{textarea}}`s' in your app by reopening `Ember.TextArea` or
       `Ember.TextSupport` and adding it to the `attributeBindings` concatenated
@@ -5582,15 +5425,15 @@ enifed("ember-handlebars/controls",
     function textareaHelper(options) {
       Ember.assert('You can only pass attributes to the `textarea` helper, not arguments', arguments.length < 2);
 
-      var hash = options.hash;
-      var types = options.hashTypes;
+      var hash = options.hash,
+          types = options.hashTypes;
 
       return helpers.view.call(this, TextArea, options);
     }
 
     __exports__.textareaHelper = textareaHelper;
   });
-enifed("ember-handlebars/controls/checkbox",
+define("ember-handlebars/controls/checkbox",
   ["ember-metal/property_get","ember-metal/property_set","ember-views/views/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -5666,7 +5509,7 @@ enifed("ember-handlebars/controls/checkbox",
       }
     });
   });
-enifed("ember-handlebars/controls/select",
+define("ember-handlebars/controls/select",
   ["ember-handlebars-compiler","ember-metal/enumerable_utils","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/collection_view","ember-metal/utils","ember-metal/is_none","ember-metal/computed","ember-runtime/system/native_array","ember-metal/mixin","ember-metal/properties","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
@@ -5714,8 +5557,8 @@ enifed("ember-handlebars/controls/select",
       },
 
       selected: computed(function() {
-        var content = get(this, 'content');
-        var selection = get(this, 'parentView.selection');
+        var content = get(this, 'content'),
+            selection = get(this, 'parentView.selection');
         if (get(this, 'parentView.multiple')) {
           return selection && indexOf(selection, content.valueOf()) > -1;
         } else {
@@ -5785,7 +5628,7 @@ enifed("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view "select" content=names}}
+      {{view Ember.Select content=names}}
       ```
 
       Would result in the following HTML:
@@ -5808,7 +5651,10 @@ enifed("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view "select" content=names value=selectedName}}
+      {{view Ember.Select
+             content=names
+             value=selectedName
+      }}
       ```
 
       Would result in the following HTML with the `<option>` for 'Tom' selected:
@@ -5847,7 +5693,7 @@ enifed("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view "select"
+      {{view Ember.Select
              content=programmers
              optionValuePath="content.id"
              optionLabelPath="content.firstName"}}
@@ -5878,7 +5724,7 @@ enifed("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view "select"
+      {{view Ember.Select
              content=programmers
              optionValuePath="content.id"
              optionLabelPath="content.firstName"
@@ -5911,12 +5757,15 @@ enifed("ember-handlebars/controls/select",
 
       App.ApplicationController = Ember.ObjectController.extend({
         selectedPerson: tom,
-        programmers: [ yehuda, tom ]
+        programmers: [
+          yehuda,
+          tom
+        ]
       });
       ```
 
       ```handlebars
-      {{view "select"
+      {{view Ember.Select
              content=programmers
              optionValuePath="content.id"
              optionLabelPath="content.firstName"
@@ -5945,12 +5794,15 @@ enifed("ember-handlebars/controls/select",
       ```javascript
       App.ApplicationController = Ember.ObjectController.extend({
         selectedProgrammer: null,
-        programmers: ["Yehuda", "Tom"]
+        programmers: [
+          "Yehuda",
+          "Tom"
+        ]
       });
       ```
 
       ``` handlebars
-      {{view "select"
+      {{view Ember.Select
              content=programmers
              value=selectedProgrammer
       }}
@@ -5974,12 +5826,15 @@ enifed("ember-handlebars/controls/select",
       ```javascript
       App.ApplicationController = Ember.ObjectController.extend({
         selectedProgrammer: null,
-        programmers: [ "Yehuda", "Tom" ]
+        programmers: [
+          "Yehuda",
+          "Tom"
+        ]
       });
       ```
 
       ```handlebars
-      {{view "select"
+      {{view Ember.Select
              content=programmers
              value=selectedProgrammer
              prompt="Please select a name"
@@ -6101,8 +5956,7 @@ enifed("ember-handlebars/controls/select",
         Otherwise, this should be a list of objects. For instance:
 
         ```javascript
-        var App = Ember.Application.create();
-        var App.MySelect = Ember.Select.extend({
+        Ember.Select.create({
           content: Ember.A([
               { id: 1, firstName: 'Yehuda' },
               { id: 2, firstName: 'Tom' }
@@ -6245,11 +6099,11 @@ enifed("ember-handlebars/controls/select",
       }),
 
       valueDidChange: observer('value', function() {
-        var content = get(this, 'content');
-        var value = get(this, 'value');
-        var valuePath = get(this, 'optionValuePath').replace(/^content\.?/, '');
-        var selectedValue = (valuePath ? get(this, 'selection.' + valuePath) : get(this, 'selection'));
-        var selection;
+        var content = get(this, 'content'),
+            value = get(this, 'value'),
+            valuePath = get(this, 'optionValuePath').replace(/^content\.?/, ''),
+            selectedValue = (valuePath ? get(this, 'selection.' + valuePath) : get(this, 'selection')),
+            selection;
 
         if (value !== selectedValue) {
           selection = content ? content.find(function(obj) {
@@ -6272,9 +6126,9 @@ enifed("ember-handlebars/controls/select",
       },
 
       _changeSingle: function() {
-        var selectedIndex = this.$()[0].selectedIndex;
-        var content = get(this, 'content');
-        var prompt = get(this, 'prompt');
+        var selectedIndex = this.$()[0].selectedIndex,
+            content = get(this, 'content'),
+            prompt = get(this, 'prompt');
 
         if (!content || !get(content, 'length')) { return; }
         if (prompt && selectedIndex === 0) { set(this, 'selection', null); return; }
@@ -6285,11 +6139,11 @@ enifed("ember-handlebars/controls/select",
 
 
       _changeMultiple: function() {
-        var options = this.$('option:selected');
-        var prompt = get(this, 'prompt');
-        var offset = prompt ? 1 : 0;
-        var content = get(this, 'content');
-        var selection = get(this, 'selection');
+        var options = this.$('option:selected'),
+            prompt = get(this, 'prompt'),
+            offset = prompt ? 1 : 0,
+            content = get(this, 'content'),
+            selection = get(this, 'selection');
 
         if (!content) { return; }
         if (options) {
@@ -6310,23 +6164,23 @@ enifed("ember-handlebars/controls/select",
         var el = this.get('element');
         if (!el) { return; }
 
-        var content = get(this, 'content');
-        var selection = get(this, 'selection');
-        var selectionIndex = content ? indexOf(content, selection) : -1;
-        var prompt = get(this, 'prompt');
+        var content = get(this, 'content'),
+            selection = get(this, 'selection'),
+            selectionIndex = content ? indexOf(content, selection) : -1,
+            prompt = get(this, 'prompt');
 
         if (prompt) { selectionIndex += 1; }
         if (el) { el.selectedIndex = selectionIndex; }
       },
 
       _selectionDidChangeMultiple: function() {
-        var content = get(this, 'content');
-        var selection = get(this, 'selection');
-        var selectedIndexes = content ? indexesOf(content, selection) : [-1];
-        var prompt = get(this, 'prompt');
-        var offset = prompt ? 1 : 0;
-        var options = this.$('option');
-        var adjusted;
+        var content = get(this, 'content'),
+            selection = get(this, 'selection'),
+            selectedIndexes = content ? indexesOf(content, selection) : [-1],
+            prompt = get(this, 'prompt'),
+            offset = prompt ? 1 : 0,
+            options = this.$('option'),
+            adjusted;
 
         if (options) {
           options.each(function() {
@@ -6348,7 +6202,7 @@ enifed("ember-handlebars/controls/select",
     __exports__.SelectOption = SelectOption;
     __exports__.SelectOptgroup = SelectOptgroup;
   });
-enifed("ember-handlebars/controls/text_area",
+define("ember-handlebars/controls/text_area",
   ["ember-metal/property_get","ember-views/views/component","ember-handlebars/controls/text_support","ember-metal/mixin","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -6385,14 +6239,14 @@ enifed("ember-handlebars/controls/text_area",
       classNames: ['ember-text-area'],
 
       tagName: "textarea",
-      attributeBindings: ['rows', 'cols', 'name', 'selectionEnd', 'selectionStart', 'wrap', 'lang', 'dir'],
+      attributeBindings: ['rows', 'cols', 'name', 'selectionEnd', 'selectionStart', 'wrap'],
       rows: null,
       cols: null,
 
       _updateElementValue: observer('value', function() {
         // We do this check so cursor position doesn't get affected in IE
-        var value = get(this, 'value');
-        var $el = this.$();
+        var value = get(this, 'value'),
+            $el = this.$();
         if ($el && value !== $el.val()) {
           $el.val(value);
         }
@@ -6404,7 +6258,7 @@ enifed("ember-handlebars/controls/text_area",
       }
     });
   });
-enifed("ember-handlebars/controls/text_field",
+define("ember-handlebars/controls/text_field",
   ["ember-metal/property_get","ember-metal/property_set","ember-views/views/component","ember-handlebars/controls/text_support","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -6444,7 +6298,7 @@ enifed("ember-handlebars/controls/text_field",
       attributeBindings: ['type', 'value', 'size', 'pattern', 'name', 'min', 'max',
                           'accept', 'autocomplete', 'autosave', 'formaction',
                           'formenctype', 'formmethod', 'formnovalidate', 'formtarget',
-                          'height', 'inputmode', 'list', 'multiple', 'step', 'lang', 'dir',
+                          'height', 'inputmode', 'list', 'multiple', 'step',
                           'width'],
 
       /**
@@ -6505,7 +6359,7 @@ enifed("ember-handlebars/controls/text_field",
       max: null
     });
   });
-enifed("ember-handlebars/controls/text_support",
+define("ember-handlebars/controls/text_support",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-runtime/mixins/target_action_support","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -6576,7 +6430,7 @@ enifed("ember-handlebars/controls/text_support",
       onEvent: 'enter',
 
       /**
-        Whether the `keyUp` event that triggers an `action` to be sent continues
+        Whether they `keyUp` event that triggers an `action` to be sent continues
         propagating to other views.
 
         By default, when the user presses the return key on their keyboard and
@@ -6644,7 +6498,7 @@ enifed("ember-handlebars/controls/text_support",
       },
 
       /**
-        Called when the text area is blurred.
+        Called when the text area is blurred. 
 
         Uses sendAction to send the `focus-out` action.
 
@@ -6679,9 +6533,9 @@ enifed("ember-handlebars/controls/text_support",
     // sendAction semantics for TextField are different from
     // the component semantics so this method normalizes them.
     function sendAction(eventName, view, event) {
-      var action = get(view, eventName);
-      var on = get(view, 'onEvent');
-      var value = get(view, 'value');
+      var action = get(view, eventName),
+          on = get(view, 'onEvent'),
+          value = get(view, 'value');
 
       // back-compat support for keyPress as an event name even though
       // it's also a method name that consumes the event (and therefore
@@ -6701,9 +6555,9 @@ enifed("ember-handlebars/controls/text_support",
 
     __exports__["default"] = TextSupport;
   });
-enifed("ember-handlebars/ext",
-  ["ember-metal/core","ember-runtime/system/string","ember-handlebars-compiler","ember-metal/property_get","ember-metal/error","ember-metal/mixin","ember-views/views/view","ember-handlebars/views/metamorph_view","ember-metal/path_cache","ember-metal/is_empty","ember-metal/cache","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+define("ember-handlebars/ext",
+  ["ember-metal/core","ember-runtime/system/string","ember-handlebars-compiler","ember-metal/property_get","ember-metal/binding","ember-metal/error","ember-metal/mixin","ember-metal/is_empty","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.FEATURES, Ember.assert, Ember.Handlebars, Ember.lookup
@@ -6715,20 +6569,17 @@ enifed("ember-handlebars/ext",
     var helpers = EmberHandlebars.helpers;
 
     var get = __dependency4__.get;
-    var EmberError = __dependency5__["default"];
-    var IS_BINDING = __dependency6__.IS_BINDING;
-
-    var View = __dependency7__["default"];
-    var _Metamorph = __dependency8__._Metamorph;
-    var detectIsGlobal = __dependency9__.isGlobal;
+    var isGlobalPath = __dependency5__.isGlobalPath;
+    var EmberError = __dependency6__["default"];
+    var IS_BINDING = __dependency7__.IS_BINDING;
 
     // late bound via requireModule because of circular dependencies.
-    var resolveHelper, SimpleHandlebarsView;
+    var resolveHelper,
+        SimpleHandlebarsView;
 
-    var isEmpty = __dependency10__["default"];
+    var isEmpty = __dependency8__["default"];
 
-    var slice = [].slice;
-    var originalTemplate = EmberHandlebars.template;
+    var slice = [].slice, originalTemplate = EmberHandlebars.template;
 
     /**
       If a path starts with a reserved keyword, returns the root
@@ -6741,20 +6592,13 @@ enifed("ember-handlebars/ext",
       @param path {String}
       @param data {Hash}
     */
-
-    var Cache = __dependency11__["default"];
-
-    var FIRST_SEGMENT_CACHE = new Cache(1000, function(path){
-      return path.split('.', 1)[0];
-    });
-
     function normalizePath(root, path, data) {
-      var keywords = (data && data.keywords) || {};
-      var keyword, isKeyword;
+      var keywords = (data && data.keywords) || {},
+          keyword, isKeyword;
 
       // Get the first segment of the path. For example, if the
       // path is "foo.bar.baz", returns "foo".
-      keyword = FIRST_SEGMENT_CACHE.get(path);
+      keyword = path.split('.', 1)[0];
 
       // Test to see if the first path is a keyword that has been
       // passed along in the view's data hash. If so, we will treat
@@ -6775,11 +6619,7 @@ enifed("ember-handlebars/ext",
         }
       }
 
-      return {
-        root: root,
-        path: path,
-        isKeyword: isKeyword
-      };
+      return { root: root, path: path, isKeyword: isKeyword };
     }
 
 
@@ -6795,135 +6635,24 @@ enifed("ember-handlebars/ext",
       @param {Object} options The template's option hash
     */
     function handlebarsGet(root, path, options) {
-      var data = options && options.data;
-      var normalizedPath = normalizePath(root, path, data);
-      var value;
+      var data = options && options.data,
+          normalizedPath = normalizePath(root, path, data),
+          value;
 
-      // In cases where the path begins with a keyword, change the
-      // root to the value represented by that keyword, and ensure
-      // the path is relative to it.
-      root = normalizedPath.root;
-      path = normalizedPath.path;
+      
+        root = normalizedPath.root;
+        path = normalizedPath.path;
 
-      // Ember.get with a null root and GlobalPath will fall back to
-      // Ember.lookup, which is no longer allowed in templates.
-      //
-      // But when outputting a primitive, root will be the primitive
-      // and path a blank string. These primitives should pass through
-      // to `get`.
-      if (root || path === '') {
         value = get(root, path);
-      }
 
-      if (detectIsGlobal(path)) {
-        if (value === undefined && root !== Ember.lookup) {
-          root = Ember.lookup;
-          value = get(root, path);
+        if (value === undefined && root !== Ember.lookup && isGlobalPath(path)) {
+          value = get(Ember.lookup, path);
         }
-        if (root === Ember.lookup || root === null) {
-          Ember.deprecate("Global lookup of "+path+" from a Handlebars template is deprecated.");
-        }
-      }
+      
 
       return value;
     }
 
-    function lookupViewInContainer(container, path) {
-      Ember.assert("View requires a container to resolve views not passed in through the context", !!container);
-      return container.lookupFactory('view:'+path);
-    }
-
-    function lookupViewByClassName(path) {
-      var viewClass;
-      if (detectIsGlobal(path)) {
-        viewClass = get(path);
-        Ember.deprecate('Resolved the view "'+path+'" on the global context. Pass a view name to be looked up on the container instead, such as {{view "select"}}. http://emberjs.com/guides/deprecations#toc_global-lookup-of-views-since-1-8', !viewClass);
-        return viewClass;
-      }
-    }
-
-    /**
-      handlebarsGetView resolves a view based on strings passed into a template.
-      For example:
-
-      ```handlebars
-      {{view "some-view"}}
-      {{view view.someView}}
-      {{view App.SomeView}} {{! deprecated }}
-      ```
-
-      A value is first checked to be a string- non-strings are presumed to be
-      an object and returned. This handles the "access a view on a context"
-      case (line 2 in the above examples).
-
-      Next a string is normalized, then called on the context with `get`. If
-      there is still no value, a GlobalPath will be fetched from the global
-      context (raising a deprecation) and a localPath will be passed to the
-      container to be looked up.
-
-      @private
-      @for Ember.Handlebars
-      @param {Object} context The context of the template being rendered
-      @param {String} path The path to be lookedup
-      @param {Object} container The container
-      @param {Object} options The options from the template
-    */
-    function handlebarsGetView(context, path, container, options) {
-      var viewClass;
-      var data;
-      var pathType;
-      if (options) {
-        data      = options.data;
-        pathType  = options.types && options.types[0];
-      }
-
-      if ('string' === typeof path) {
-        if('STRING' === pathType && container) {
-          viewClass = lookupViewInContainer(container, path);
-          Ember.deprecate('Quoted view names must refer to a view in the container.', viewClass);
-
-        }
-
-        if(!viewClass) {
-          viewClass = lookupViewByClassName(path);
-        }
-
-        if(!viewClass) {
-          if (data) {
-            var normalizedPath = normalizePath(context, path, data);
-            context = normalizedPath.root;
-            path = normalizedPath.path;
-          }
-
-          // Only lookup view class on context if there is a context. If not,
-          // the global lookup path on get may kick in.
-          viewClass = context && get(context, path);
-
-          if(!viewClass) {
-            // try the container once more with the normalized path
-            viewClass = lookupViewInContainer(container, path);
-          }
-        }
-      } else {
-        viewClass = path;
-      }
-
-      // Sometimes a view's value is yet another path
-      if ('string' === typeof viewClass && data && data.view) {
-        viewClass = handlebarsGetView(data.view, viewClass, container, {
-          data: data,
-          types: ['ID']
-        });
-      }
-
-      Ember.assert(
-        fmt(path+" must be a subclass or an instance of Ember.View, not %@", [viewClass]),
-        View.detect(viewClass) || View.detectInstance(viewClass)
-      );
-
-      return viewClass;
-    }
-
     /**
       This method uses `Ember.Handlebars.get` to lookup a value, then ensures
       that the value is escaped properly.
@@ -7165,8 +6894,8 @@ enifed("ember-handlebars/ext",
       @param {String} dependentKeys*
     */
     function registerBoundHelper(name, fn) {
-      var boundHelperArgs = slice.call(arguments, 1);
-      var boundFn = makeBoundHelper.apply(this, boundHelperArgs);
+      var boundHelperArgs = slice.call(arguments, 1),
+          boundFn = makeBoundHelper.apply(this, boundHelperArgs);
       EmberHandlebars.registerHelper(name, boundFn);
     }
 
@@ -7201,21 +6930,21 @@ enifed("ember-handlebars/ext",
       var dependentKeys = slice.call(arguments, 1);
 
       function helper() {
-        var properties = slice.call(arguments, 0, -1);
-        var numProperties = properties.length;
-        var options = arguments[arguments.length - 1];
-        var normalizedProperties = [];
-        var data = options.data;
-        var types = data.isUnbound ? slice.call(options.types, 1) : options.types;
-        var hash = options.hash;
+        var properties = slice.call(arguments, 0, -1),
+          numProperties = properties.length,
+          options = arguments[arguments.length - 1],
+          normalizedProperties = [],
+          data = options.data,
+          types = data.isUnbound ? slice.call(options.types, 1) : options.types,
+          hash = options.hash,
+          view = data.view,
+          contexts = options.contexts,
+          currentContext = (contexts && contexts.length) ? contexts[0] : this,
+          prefixPathForDependentKeys = '',
+          loc, len, hashOption,
+          boundOption, property,
+          normalizedValue = SimpleHandlebarsView.prototype.normalizedValue;
         var hashTypes = options.hashTypes;
-        var view = data.view;
-        var contexts = options.contexts;
-        var currentContext = (contexts && contexts.length) ? contexts[0] : this;
-        var prefixPathForDependentKeys = '';
-        var loc, len, hashOption;
-        var boundOption, property;
-        var normalizedValue = SimpleHandlebarsView.prototype.normalizedValue;
 
         Ember.assert("registerBoundHelper-generated helpers do not support use with Handlebars blocks.", !options.fn);
 
@@ -7240,7 +6969,7 @@ enifed("ember-handlebars/ext",
             normalizedProperties.push(normalizedProp);
             watchedProperties.push(normalizedProp);
           } else {
-            if (data.isUnbound) {
+            if(data.isUnbound) {
               normalizedProperties.push({path: properties[loc]});
             }else {
               normalizedProperties.push(null);
@@ -7258,8 +6987,7 @@ enifed("ember-handlebars/ext",
 
         // Override SimpleHandlebarsView's method for generating the view's content.
         bindView.normalizedValue = function() {
-          var args = [];
-          var boundOption;
+          var args = [], boundOption;
 
           // Copy over bound hash options.
           for (boundOption in boundOptions) {
@@ -7306,9 +7034,9 @@ enifed("ember-handlebars/ext",
         }
 
         // Add dependent key observers to the first param
-        var normalized = normalizedProperties[0];
-        var pathRoot = normalized.root;
-        var path = normalized.path;
+        var normalized = normalizedProperties[0],
+            pathRoot = normalized.root,
+            path = normalized.path;
 
         if(!isEmpty(path)) {
           prefixPathForDependentKeys = path + '.';
@@ -7333,21 +7061,25 @@ enifed("ember-handlebars/ext",
       @param {String} options
     */
     function evaluateUnboundHelper(context, fn, normalizedProperties, options) {
-      var args = [];
-      var hash = options.hash;
-      var boundOptions = hash.boundOptions;
-      var types = slice.call(options.types, 1);
-      var loc, len, property, propertyType, boundOption;
+      var args = [],
+       hash = options.hash,
+       boundOptions = hash.boundOptions,
+       types = slice.call(options.types, 1),
+       loc,
+       len,
+       property,
+       propertyType,
+       boundOption;
 
       for (boundOption in boundOptions) {
         if (!boundOptions.hasOwnProperty(boundOption)) { continue; }
         hash[boundOption] = handlebarsGet(context, boundOptions[boundOption], options);
       }
 
-      for (loc = 0, len = normalizedProperties.length; loc < len; ++loc) {
+      for(loc = 0, len = normalizedProperties.length; loc < len; ++loc) {
         property = normalizedProperties[loc];
         propertyType = types[loc];
-        if (propertyType === "ID") {
+        if(propertyType === "ID") {
           args.push(handlebarsGet(property.root, property.path, options));
         } else {
           args.push(property.path);
@@ -7375,12 +7107,11 @@ enifed("ember-handlebars/ext",
     __exports__.template = template;__exports__.normalizePath = normalizePath;
     __exports__.makeBoundHelper = makeBoundHelper;
     __exports__.handlebarsGet = handlebarsGet;
-    __exports__.handlebarsGetView = handlebarsGetView;
     __exports__.evaluateUnboundHelper = evaluateUnboundHelper;
   });
-enifed("ember-handlebars/helpers/binding",
-  ["ember-metal/core","ember-handlebars-compiler","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/string","ember-metal/platform","ember-metal/is_none","ember-metal/enumerable_utils","ember-metal/array","ember-views/views/view","ember-metal/run_loop","ember-metal/observer","ember-metal/binding","ember-views/system/jquery","ember-handlebars/ext","ember-metal/keys","ember-metal/cache","ember-handlebars/views/handlebars_bound_view","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __exports__) {
+define("ember-handlebars/helpers/binding",
+  ["ember-metal/core","ember-handlebars-compiler","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/string","ember-metal/platform","ember-metal/is_none","ember-metal/enumerable_utils","ember-metal/array","ember-views/views/view","ember-metal/run_loop","ember-metal/observer","ember-metal/binding","ember-views/system/jquery","ember-handlebars/ext","ember-runtime/keys","ember-handlebars/views/handlebars_bound_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -7410,10 +7141,9 @@ enifed("ember-handlebars/helpers/binding",
     var isArray = __dependency5__.isArray;
     var handlebarsGetEscaped = __dependency16__.getEscaped;
     var keys = __dependency17__["default"];
-    var Cache = __dependency18__["default"];
 
-    var _HandlebarsBoundView = __dependency19__._HandlebarsBoundView;
-    var SimpleHandlebarsView = __dependency19__.SimpleHandlebarsView;
+    var _HandlebarsBoundView = __dependency18__._HandlebarsBoundView;
+    var SimpleHandlebarsView = __dependency18__.SimpleHandlebarsView;
 
     var normalizePath = __dependency16__.normalizePath;
     var handlebarsGet = __dependency16__.handlebarsGet;
@@ -7482,11 +7212,11 @@ enifed("ember-handlebars/helpers/binding",
     // Binds a property into the DOM. This will create a hook in DOM that the
     // KVO system will look for and update if the property changes.
     function bind(property, options, preserveContext, shouldDisplay, valueNormalizer, childProperties) {
-      var data = options.data;
-      var fn = options.fn;
-      var inverse = options.inverse;
-      var view = data.view;
-      var normalized, observer, i;
+      var data = options.data,
+          fn = options.fn,
+          inverse = options.inverse,
+          view = data.view,
+          normalized, observer, i;
 
       // we relied on the behavior of calling without
       // context to mean this === window, but when running
@@ -7495,78 +7225,84 @@ enifed("ember-handlebars/helpers/binding",
 
       normalized = normalizePath(currentContext, property, data);
 
-      if (data.insideGroup) {
-        observer = function() {
-          while (view._contextView) {
-            view = view._contextView;
+      // Set up observers for observable objects
+      if ('object' === typeof this) {
+        if (data.insideGroup) {
+          observer = function() {
+            while (view._contextView) {
+              view = view._contextView;
+            }
+            run.once(view, 'rerender');
+          };
+
+          var template, context, result = handlebarsGet(currentContext, property, options);
+
+          result = valueNormalizer ? valueNormalizer(result) : result;
+
+          context = preserveContext ? currentContext : result;
+          if (shouldDisplay(result)) {
+            template = fn;
+          } else if (inverse) {
+            template = inverse;
           }
-          run.once(view, 'rerender');
-        };
 
-        var template, context;
-        var result = handlebarsGet(currentContext, property, options);
+          template(context, { data: options.data });
+        } else {
+          var viewClass = _HandlebarsBoundView;
+          var viewOptions = {
+            preserveContext: preserveContext,
+            shouldDisplayFunc: shouldDisplay,
+            valueNormalizerFunc: valueNormalizer,
+            displayTemplate: fn,
+            inverseTemplate: inverse,
+            path: property,
+            pathRoot: currentContext,
+            previousContext: currentContext,
+            isEscaped: !options.hash.unescaped,
+            templateData: options.data,
+            templateHash: options.hash,
+            helperName: options.helperName
+          };
 
-        result = valueNormalizer ? valueNormalizer(result) : result;
+          if (options.isWithHelper) {
+            viewClass = WithView;
+          }
 
-        context = preserveContext ? currentContext : result;
-        if (shouldDisplay(result)) {
-          template = fn;
-        } else if (inverse) {
-          template = inverse;
+          // Create the view that will wrap the output of this template/property
+          // and add it to the nearest view's childViews array.
+          // See the documentation of Ember._HandlebarsBoundView for more.
+          var bindView = view.createChildView(viewClass, viewOptions);
+
+          view.appendChild(bindView);
+
+          observer = function() {
+            run.scheduleOnce('render', bindView, 'rerenderIfNeeded');
+          };
         }
 
-        template(context, { data: options.data });
+        // Observes the given property on the context and
+        // tells the Ember._HandlebarsBoundView to re-render. If property
+        // is an empty string, we are printing the current context
+        // object ({{this}}) so updating it is not our responsibility.
+        if (normalized.path !== '') {
+          view.registerObserver(normalized.root, normalized.path, observer);
+          if (childProperties) {
+            for (i=0; i<childProperties.length; i++) {
+              view.registerObserver(normalized.root, normalized.path+'.'+childProperties[i], observer);
+            }
+          }
+        }
       } else {
-        var viewClass = _HandlebarsBoundView;
-        var viewOptions = {
-          preserveContext: preserveContext,
-          shouldDisplayFunc: shouldDisplay,
-          valueNormalizerFunc: valueNormalizer,
-          displayTemplate: fn,
-          inverseTemplate: inverse,
-          path: property,
-          pathRoot: currentContext,
-          previousContext: currentContext,
-          isEscaped: !options.hash.unescaped,
-          templateData: options.data,
-          templateHash: options.hash,
-          helperName: options.helperName
-        };
-
-        if (options.isWithHelper) {
-          viewClass = WithView;
-        }
-
-        // Create the view that will wrap the output of this template/property
-        // and add it to the nearest view's childViews array.
-        // See the documentation of Ember._HandlebarsBoundView for more.
-        var bindView = view.createChildView(viewClass, viewOptions);
-
-        view.appendChild(bindView);
-
-        observer = function() {
-          run.scheduleOnce('render', bindView, 'rerenderIfNeeded');
-        };
-      }
-
-      // Observes the given property on the context and
-      // tells the Ember._HandlebarsBoundView to re-render. If property
-      // is an empty string, we are printing the current context
-      // object ({{this}}) so updating it is not our responsibility.
-      if (typeof this === 'object' && normalized.path !== '') {
-        view.registerObserver(normalized.root, normalized.path, observer);
-        if (childProperties) {
-          for (i=0; i<childProperties.length; i++) {
-            view.registerObserver(normalized.root, normalized.path+'.'+childProperties[i], observer);
-          }
-        }
+        // The object is not observable, so just render it out and
+        // be done with it.
+        data.buffer.push(handlebarsGetEscaped(currentContext, property, options));
       }
     }
 
     function simpleBind(currentContext, property, options) {
-      var data = options.data;
-      var view = data.view;
-      var normalized, observer, pathRoot, output;
+      var data = options.data,
+          view = data.view,
+          normalized, observer, pathRoot, output;
 
       normalized = normalizePath(currentContext, property, data);
       pathRoot = normalized.root;
@@ -7649,10 +7385,6 @@ enifed("ember-handlebars/helpers/binding",
       return helpers.bind.call(this, property, options);
     }
 
-    var ISNT_HELPER_CACHE = new Cache(1000, function(key) {
-      return key.indexOf('-') === -1;
-    });
-    __exports__.ISNT_HELPER_CACHE = ISNT_HELPER_CACHE;
     /**
       Used to lookup/resolve handlebars helpers. The lookup order is:
 
@@ -7673,7 +7405,7 @@ enifed("ember-handlebars/helpers/binding",
         return helpers[name];
       }
 
-      if (!container || ISNT_HELPER_CACHE.get(name)) {
+      if (!container || name.indexOf('-') === -1) {
         return;
       }
 
@@ -7754,6 +7486,7 @@ enifed("ember-handlebars/helpers/binding",
       return bind.call(context, property, fn, true, shouldDisplayIfHelperContent, shouldDisplayIfHelperContent, ['isTruthy', 'length']);
     }
 
+
     /**
       @private
 
@@ -7773,11 +7506,11 @@ enifed("ember-handlebars/helpers/binding",
       @since 1.4.0
     */
     function unboundIfHelper(property, fn) {
-      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this;
-      var data = fn.data;
-      var template = fn.fn;
-      var inverse = fn.inverse;
-      var normalized, propertyValue, result;
+      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this,
+          data = fn.data,
+          template = fn.fn,
+          inverse = fn.inverse,
+          normalized, propertyValue, result;
 
       normalized = normalizePath(context, property, data);
       propertyValue = handlebarsGet(context, property, fn);
@@ -7868,8 +7601,7 @@ enifed("ember-handlebars/helpers/binding",
       @return {String} HTML string
     */
     function withHelper(context, options) {
-      var bindContext, preserveContext, controller;
-      var helperName = 'with';
+      var bindContext, preserveContext, controller, helperName = 'with';
 
       if (arguments.length === 4) {
         var keywordName, path, rootPath, normalized, contextPath;
@@ -7959,9 +7691,7 @@ enifed("ember-handlebars/helpers/binding",
       Ember.assert("You must pass exactly one argument to the unless helper", arguments.length === 2);
       Ember.assert("You must pass a block to the unless helper", options.fn && options.fn !== Handlebars.VM.noop);
 
-      var fn = options.fn;
-      var inverse = options.inverse;
-      var helperName = 'unless';
+      var fn = options.fn, inverse = options.inverse, helperName = 'unless';
 
       if (context) {
         helperName += ' ' + context;
@@ -8134,15 +7864,15 @@ enifed("ember-handlebars/helpers/binding",
       // For each attribute passed, create an observer and emit the
       // current value of the property as an attribute.
       forEach.call(attrKeys, function(attr) {
-        var path = attrs[attr];
-        var normalized;
+        var path = attrs[attr],
+            normalized;
 
         Ember.assert(fmt("You must provide an expression as the value of bound attribute. You specified: %@=%@", [attr, path]), typeof path === 'string');
 
         normalized = normalizePath(ctx, path, options.data);
 
-        var value = (path === 'this') ? normalized.root : handlebarsGet(ctx, path, options);
-        var type = typeOf(value);
+        var value = (path === 'this') ? normalized.root : handlebarsGet(ctx, path, options),
+            type = typeOf(value);
 
         Ember.assert(fmt("Attributes must be numbers, strings or booleans, not %@", [value]), value === null || value === undefined || type === 'number' || type === 'string' || type === 'boolean');
 
@@ -8232,15 +7962,14 @@ enifed("ember-handlebars/helpers/binding",
       @return {Array} An array of class names to add
     */
     function bindClasses(context, classBindings, view, bindAttrId, options) {
-      var ret = [];
-      var newClass, value, elem;
+      var ret = [], newClass, value, elem;
 
       // Helper method to retrieve the property from the context and
       // determine which class string to return, based on whether it is
       // a Boolean or not.
       var classStringForPath = function(root, parsedPath, options) {
-        var val;
-        var path = parsedPath.path;
+        var val,
+            path = parsedPath.path;
 
         if (path === 'this') {
           val = root;
@@ -8261,11 +7990,13 @@ enifed("ember-handlebars/helpers/binding",
         // closes over this variable, so it knows which string to remove when
         // the property changes.
         var oldClass;
+
         var observer;
-        var parsedPath = View._parsePropertyPath(binding);
-        var path = parsedPath.path;
-        var pathRoot = context;
-        var normalized;
+
+        var parsedPath = View._parsePropertyPath(binding),
+            path = parsedPath.path,
+            pathRoot = context,
+            normalized;
 
         if (path !== '' && path !== 'this') {
           normalized = normalizePath(context, path, options.data);
@@ -8335,7 +8066,7 @@ enifed("ember-handlebars/helpers/binding",
     __exports__.bindAttrHelperDeprecated = bindAttrHelperDeprecated;
     __exports__.bindClasses = bindClasses;
   });
-enifed("ember-handlebars/helpers/collection",
+define("ember-handlebars/helpers/collection",
   ["ember-metal/core","ember-metal/utils","ember-handlebars-compiler","ember-runtime/system/string","ember-metal/property_get","ember-handlebars/ext","ember-handlebars/helpers/view","ember-metal/computed","ember-views/views/collection_view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -8357,7 +8088,6 @@ enifed("ember-handlebars/helpers/collection",
     var fmt = __dependency4__.fmt;
     var get = __dependency5__.get;
     var handlebarsGet = __dependency6__.handlebarsGet;
-    var handlebarsGetView = __dependency6__.handlebarsGetView;
     var ViewHelper = __dependency7__.ViewHelper;
     var computed = __dependency8__.computed;
     var CollectionView = __dependency9__["default"];
@@ -8379,8 +8109,7 @@ enifed("ember-handlebars/helpers/collection",
       Given an empty `<body>` the following template:
 
       ```handlebars
-      {{! application.hbs }}
-      {{#collection content=model}}
+      {{#collection contentBinding="App.items"}}
         Hi {{view.content.name}}
       {{/collection}}
       ```
@@ -8388,45 +8117,44 @@ enifed("ember-handlebars/helpers/collection",
       And the following application code
 
       ```javascript
-      App = Ember.Application.create();
-      App.ApplicationRoute = Ember.Route.extend({
-        model: function(){
-          return [{name: 'Yehuda'},{name: 'Tom'},{name: 'Peter'}];
-        }
-      });
+      App = Ember.Application.create()
+      App.items = [
+        Ember.Object.create({name: 'Dave'}),
+        Ember.Object.create({name: 'Mary'}),
+        Ember.Object.create({name: 'Sara'})
+      ]
       ```
 
-      The following HTML will result:
+      Will result in the HTML structure below
 
       ```html
       <div class="ember-view">
-        <div class="ember-view">Hi Yehuda</div>
-        <div class="ember-view">Hi Tom</div>
-        <div class="ember-view">Hi Peter</div>
+        <div class="ember-view">Hi Dave</div>
+        <div class="ember-view">Hi Mary</div>
+        <div class="ember-view">Hi Sara</div>
       </div>
       ```
 
-      ### Non-block version of collection
+      ### Blockless use in a collection
 
-      If you provide an `itemViewClass` option that has its own `template` you may
+      If you provide an `itemViewClass` option that has its own `template` you can
       omit the block.
 
       The following template:
 
       ```handlebars
-      {{! application.hbs }}
-      {{collection content=model itemViewClass="an-item"}}
+      {{collection contentBinding="App.items" itemViewClass="App.AnItemView"}}
       ```
 
       And application code
 
       ```javascript
       App = Ember.Application.create();
-      App.ApplicationRoute = Ember.Route.extend({
-        model: function(){
-          return [{name: 'Yehuda'},{name: 'Tom'},{name: 'Peter'}];
-        }
-      });
+      App.items = [
+        Ember.Object.create({name: 'Dave'}),
+        Ember.Object.create({name: 'Mary'}),
+        Ember.Object.create({name: 'Sara'})
+      ];
 
       App.AnItemView = Ember.View.extend({
         template: Ember.Handlebars.compile("Greetings {{view.content.name}}")
@@ -8437,9 +8165,9 @@ enifed("ember-handlebars/helpers/collection",
 
       ```html
       <div class="ember-view">
-        <div class="ember-view">Greetings Yehuda</div>
-        <div class="ember-view">Greetings Tom</div>
-        <div class="ember-view">Greetings Peter</div>
+        <div class="ember-view">Greetings Dave</div>
+        <div class="ember-view">Greetings Mary</div>
+        <div class="ember-view">Greetings Sara</div>
       </div>
       ```
 
@@ -8450,13 +8178,11 @@ enifed("ember-handlebars/helpers/collection",
       the helper by passing it as the first argument:
 
       ```handlebars
-      {{#collection "my-custom-collection" content=model}}
+      {{#collection App.MyCustomCollectionClass contentBinding="App.items"}}
         Hi {{view.content.name}}
       {{/collection}}
       ```
 
-      This example would look for the class `App.MyCustomCollection`.
-
       ### Forwarded `item.*`-named Options
 
       As with the `{{view}}`, helper options passed to the `{{collection}}` will be
@@ -8465,7 +8191,7 @@ enifed("ember-handlebars/helpers/collection",
       item (note the camelcasing):
 
       ```handlebars
-      {{#collection content=model
+      {{#collection contentBinding="App.items"
                     itemTagName="p"
                     itemClassNames="greeting"}}
         Howdy {{view.content.name}}
@@ -8476,9 +8202,9 @@ enifed("ember-handlebars/helpers/collection",
 
       ```html
       <div class="ember-view">
-        <p class="ember-view greeting">Howdy Yehuda</p>
-        <p class="ember-view greeting">Howdy Tom</p>
-        <p class="ember-view greeting">Howdy Peter</p>
+        <p class="ember-view greeting">Howdy Dave</p>
+        <p class="ember-view greeting">Howdy Mary</p>
+        <p class="ember-view greeting">Howdy Sara</p>
       </div>
       ```
 
@@ -8501,39 +8227,48 @@ enifed("ember-handlebars/helpers/collection",
         Ember.assert("You cannot pass more than one argument to the collection helper", arguments.length === 2);
       }
 
-      var fn        = options.fn,
-          data      = options.data,
-          inverse   = options.inverse,
-          view      = options.data.view,
-          // This should be deterministic, and should probably come from a
-          // parent view and not the controller.
-          container = (view.controller && view.controller.container ? view.controller.container : view.container);
+      var fn = options.fn;
+      var data = options.data;
+      var inverse = options.inverse;
+      var view = options.data.view;
 
+
+      var controller, container;
       // If passed a path string, convert that into an object.
       // Otherwise, just default to the standard class.
       var collectionClass;
       if (path) {
-        collectionClass = handlebarsGetView(this, path, container, options);
+        controller = data.keywords.controller;
+        container = controller && controller.container;
+        collectionClass = handlebarsGet(this, path, options) || container.lookupFactory('view:' + path);
         Ember.assert(fmt("%@ #collection: Could not find collection class %@", [data.view, path]), !!collectionClass);
       }
       else {
         collectionClass = CollectionView;
       }
 
-      var hash = options.hash;
-      var itemHash = {};
-      var match;
+      var hash = options.hash, itemHash = {}, match;
 
       // Extract item view class if provided else default to the standard class
-      var collectionPrototype = collectionClass.proto();
-      var itemViewClass;
+      var collectionPrototype = collectionClass.proto(), itemViewClass;
 
       if (hash.itemView) {
-        itemViewClass = handlebarsGetView(this, hash.itemView, container, options);
+        controller = data.keywords.controller;
+        Ember.assert('You specified an itemView, but the current context has no ' +
+                     'container to look the itemView up in. This probably means ' +
+                     'that you created a view manually, instead of through the ' +
+                     'container. Instead, use container.lookup("view:viewName"), ' +
+                     'which will properly instantiate your view.',
+                     controller && controller.container);
+        container = controller.container;
+        itemViewClass = container.lookupFactory('view:' + hash.itemView);
+        Ember.assert('You specified the itemView ' + hash.itemView + ", but it was " +
+                     "not found at " + container.describe("view:" + hash.itemView) +
+                     " (and it was not registered in the container)", !!itemViewClass);
       } else if (hash.itemViewClass) {
-        itemViewClass = handlebarsGetView(collectionPrototype, hash.itemViewClass, container, options);
+        itemViewClass = handlebarsGet(collectionPrototype, hash.itemViewClass, options);
       } else {
-        itemViewClass = handlebarsGetView(collectionPrototype, collectionPrototype.itemViewClass, container, options);
+        itemViewClass = collectionPrototype.itemViewClass;
       }
 
       Ember.assert(fmt("%@ #collection: Could not find itemViewClass %@", [data.view, itemViewClass]), !!itemViewClass);
@@ -8570,7 +8305,7 @@ enifed("ember-handlebars/helpers/collection",
               tagName: itemHash.tagName
         });
       } else if (hash.emptyViewClass) {
-        emptyViewClass = handlebarsGetView(this, hash.emptyViewClass, container, options);
+        emptyViewClass = handlebarsGet(this, hash.emptyViewClass, options);
       }
       if (emptyViewClass) { hash.emptyView = emptyViewClass; }
 
@@ -8590,7 +8325,7 @@ enifed("ember-handlebars/helpers/collection",
 
     __exports__["default"] = collectionHelper;
   });
-enifed("ember-handlebars/helpers/debug",
+define("ember-handlebars/helpers/debug",
   ["ember-metal/core","ember-metal/utils","ember-metal/logger","ember-metal/property_get","ember-handlebars/ext","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -8624,18 +8359,18 @@ enifed("ember-handlebars/helpers/debug",
       @param {String} property
     */
     function logHelper() {
-      var params = a_slice.call(arguments, 0, -1);
-      var options = arguments[arguments.length - 1];
-      var logger = Logger.log;
-      var values = [];
-      var allowPrimitives = true;
+      var params = a_slice.call(arguments, 0, -1),
+          options = arguments[arguments.length - 1],
+          logger = Logger.log,
+          values = [],
+          allowPrimitives = true;
 
       for (var i = 0; i < params.length; i++) {
         var type = options.types[i];
 
         if (type === 'ID' || !allowPrimitives) {
-          var context = (options.contexts && options.contexts[i]) || this;
-          var normalized = normalizePath(context, params[i], options.data);
+          var context = (options.contexts && options.contexts[i]) || this,
+              normalized = normalizePath(context, params[i], options.data);
 
           if (normalized.path === 'this') {
             values.push(normalized.root);
@@ -8697,7 +8432,7 @@ enifed("ember-handlebars/helpers/debug",
     __exports__.logHelper = logHelper;
     __exports__.debuggerHelper = debuggerHelper;
   });
-enifed("ember-handlebars/helpers/each",
+define("ember-handlebars/helpers/each",
   ["ember-metal/core","ember-handlebars-compiler","ember-runtime/system/string","ember-metal/property_get","ember-metal/property_set","ember-views/views/collection_view","ember-metal/binding","ember-runtime/mixins/controller","ember-runtime/controllers/array_controller","ember-runtime/mixins/array","ember-runtime/copy","ember-metal/run_loop","ember-metal/events","ember-handlebars/ext","ember-metal/computed","ember-metal/observer","ember-handlebars/views/metamorph_view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
     "use strict";
@@ -8708,6 +8443,7 @@ enifed("ember-handlebars/helpers/each",
     */
     var Ember = __dependency1__["default"];
     // Ember.assert;, Ember.K
+    // var emberAssert = Ember.assert,
     var K = Ember.K;
 
     var EmberHandlebars = __dependency2__["default"];
@@ -8833,9 +8569,29 @@ enifed("ember-handlebars/helpers/each",
       }
     });
 
+    // Defeatureify doesn't seem to like nested functions that need to be removed
+    function _addMetamorphCheck() {
+      EachView.reopen({
+        _checkMetamorph: on('didInsertElement', function() {
+          Ember.assert("The metamorph tags, " +
+                       this.morph.start + " and " + this.morph.end +
+                       ", have different parents.\nThe browser has fixed your template to output valid HTML (for example, check that you have properly closed all tags and have used a TBODY tag when creating a table with '{{#each}}')",
+            document.getElementById( this.morph.start ).parentNode ===
+            document.getElementById( this.morph.end ).parentNode
+          );
+        })
+      });
+    }
+
+    // until ember-debug is es6ed
+    var runInDebug = function(f){ f(); };
+    runInDebug( function() {
+      _addMetamorphCheck();
+    });
+
     var GroupedEach = EmberHandlebars.GroupedEach = function(context, path, options) {
-      var self = this;
-      var normalized = EmberHandlebars.normalizePath(context, path, options.data);
+      var self = this,
+          normalized = EmberHandlebars.normalizePath(context, path, options.data);
 
       this.context = context;
       this.path = path;
@@ -8906,11 +8662,11 @@ enifed("ember-handlebars/helpers/each",
       render: function() {
         if (!this.content) { return; }
 
-        var content = this.content;
-        var contentLength = get(content, 'length');
-        var options = this.options;
-        var data = options.data;
-        var template = this.template;
+        var content = this.content,
+            contentLength = get(content, 'length'),
+            options = this.options,
+            data = options.data,
+            template = this.template;
 
         data.insideEach = true;
         for (var i = 0; i < contentLength; i++) {
@@ -8940,161 +8696,131 @@ enifed("ember-handlebars/helpers/each",
     };
 
     /**
-      The `{{#each}}` helper loops over elements in a collection. It is an extension
-      of the base Handlebars `{{#each}}` helper.
-
-      The default behavior of `{{#each}}` is to yield its inner block once for every
-      item in an array. Each yield will provide the item as the context of the block.
+      The `{{#each}}` helper loops over elements in a collection, rendering its
+      block once for each item. It is an extension of the base Handlebars `{{#each}}`
+      helper:
 
       ```javascript
-      var developers = [{name: 'Yehuda'},{name: 'Tom'}, {name: 'Paul'}];
+      Developers = [{name: 'Yehuda'},{name: 'Tom'}, {name: 'Paul'}];
       ```
 
       ```handlebars
-      {{#each developers}}
+      {{#each Developers}}
         {{name}}
-        {{! `this` is each developer }}
       {{/each}}
       ```
 
-      `{{#each}}` supports an alternative syntax with element naming. This preserves
-      context of the yielded block:
+      `{{each}}` supports an alternative syntax with element naming:
 
       ```handlebars
-      {{#each person in developers}}
+      {{#each person in Developers}}
         {{person.name}}
-        {{! `this` is whatever it was outside the #each }}
       {{/each}}
       ```
 
-      The same rules apply to arrays of primitives, but the items may need to be
-      references with `{{this}}`.
+      When looping over objects that do not have properties, `{{this}}` can be used
+      to render the object:
 
       ```javascript
-      var developerNames = ['Yehuda', 'Tom', 'Paul']
+      DeveloperNames = ['Yehuda', 'Tom', 'Paul']
       ```
 
       ```handlebars
-      {{#each developerNames}}
+      {{#each DeveloperNames}}
         {{this}}
       {{/each}}
       ```
-
       ### {{else}} condition
-
       `{{#each}}` can have a matching `{{else}}`. The contents of this block will render
       if the collection is empty.
 
       ```
-      {{#each person in developers}}
+      {{#each person in Developers}}
         {{person.name}}
       {{else}}
         <p>Sorry, nobody is available for this task.</p>
       {{/each}}
       ```
-
-      ### Specifying an alternative view for each item
-
-      `itemViewClass` can control which view will be used during the render of each
-      item's template.
+      ### Specifying a View class for items
+      If you provide an `itemViewClass` option that references a view class
+      with its own `template` you can omit the block.
 
       The following template:
 
       ```handlebars
-      <ul>
-      {{#each developers itemViewClass="person"}}
-        {{name}}
-      {{/each}}
-      </ul>
+      {{#view App.MyView }}
+        {{each view.items itemViewClass="App.AnItemView"}}
+      {{/view}}
       ```
 
-      Will use the following view for each item
+      And application code
 
       ```javascript
-      App.PersonView = Ember.View.extend({
-        tagName: 'li'
+      App = Ember.Application.create({
+        MyView: Ember.View.extend({
+          items: [
+            Ember.Object.create({name: 'Dave'}),
+            Ember.Object.create({name: 'Mary'}),
+            Ember.Object.create({name: 'Sara'})
+          ]
+        })
+      });
+
+      App.AnItemView = Ember.View.extend({
+        template: Ember.Handlebars.compile("Greetings {{name}}")
       });
       ```
 
-      Resulting in HTML output that looks like the following:
+      Will result in the HTML structure below
 
       ```html
-      <ul>
-        <li class="ember-view">Yehuda</li>
-        <li class="ember-view">Tom</li>
-        <li class="ember-view">Paul</li>
-      </ul>
+      <div class="ember-view">
+        <div class="ember-view">Greetings Dave</div>
+        <div class="ember-view">Greetings Mary</div>
+        <div class="ember-view">Greetings Sara</div>
+      </div>
       ```
 
-      `itemViewClass` also enables a non-block form of `{{each}}`. The view
-      must {{#crossLink "Ember.View/toc_templates"}}provide its own template{{/crossLink}},
-      and then the block should be dropped. An example that outputs the same HTML
-      as the previous one:
+      If an `itemViewClass` is defined on the helper, and therefore the helper is not
+      being used as a block, an `emptyViewClass` can also be provided optionally.
+      The `emptyViewClass` will match the behavior of the `{{else}}` condition
+      described above. That is, the `emptyViewClass` will render if the collection
+      is empty.
+
+      ### Representing each item with a Controller.
+      By default the controller lookup within an `{{#each}}` block will be
+      the controller of the template where the `{{#each}}` was used. If each
+      item needs to be presented by a custom controller you can provide a
+      `itemController` option which references a controller by lookup name.
+      Each item in the loop will be wrapped in an instance of this controller
+      and the item itself will be set to the `model` property of that controller.
+
+      This is useful in cases where properties of model objects need transformation
+      or synthesis for display:
 
       ```javascript
-      App.PersonView = Ember.View.extend({
-        tagName: 'li',
-        template: '{{name}}'
-      });
-      ```
-
-      ```handlebars
-      <ul>
-        {{each developers itemViewClass="person"}}
-      </ul>
-      ```
-
-      ### Specifying an alternative view for no items (else)
-
-      The `emptyViewClass` option provides the same flexibility to the `{{else}}`
-      case of the each helper.
-
-      ```javascript
-      App.NoPeopleView = Ember.View.extend({
-        tagName: 'li',
-        template: 'No person is available, sorry'
-      });
-      ```
-
-      ```handlebars
-      <ul>
-      {{#each developers emptyViewClass="no-people"}}
-        <li>{{name}}</li>
-      {{/each}}
-      </ul>
-      ```
-
-      ### Wrapping each item in a controller
-
-      Controllers in Ember manage state and decorate data. In many cases,
-      providing a controller for each item in a list can be useful.
-      Specifically, an {{#crossLink "Ember.ObjectController"}}Ember.ObjectController{{/crossLink}}
-      should probably be used. Item controllers are passed the item they
-      will present as a `model` property, and an object controller will
-      proxy property lookups to `model` for us.
-
-      This allows state and decoration to be added to the controller
-      while any other property lookups are delegated to the model. An example:
-
-      ```javascript
-      App.RecruitController = Ember.ObjectController.extend({
+      App.DeveloperController = Ember.ObjectController.extend({
         isAvailableForHire: function() {
-          return !this.get('isEmployed') && this.get('isSeekingWork');
+          return !this.get('model.isEmployed') && this.get('model.isSeekingWork');
         }.property('isEmployed', 'isSeekingWork')
       })
       ```
 
       ```handlebars
-      {{#each person in developers itemController="recruit"}}
+      {{#each person in developers itemController="developer"}}
         {{person.name}} {{#if person.isAvailableForHire}}Hire me!{{/if}}
       {{/each}}
       ```
 
+      Each itemController will receive a reference to the current controller as
+      a `parentController` property.
+
       ### (Experimental) Grouped Each
 
-      If a list's membership often changes, but properties of items in that
-      group rarely change, a significant improvement in template rendering
-      time can be achieved by using the experimental [group helper](https://github.com/emberjs/group-helper).
+      When used in conjunction with the experimental [group helper](https://github.com/emberjs/group-helper),
+      you can inform Handlebars to re-render an entire group of items instead of
+      re-rendering them one at a time (in the event that they are changed en masse
+      or an item is added/removed).
 
       ```handlebars
       {{#group}}
@@ -9104,32 +8830,33 @@ enifed("ember-handlebars/helpers/each",
       {{/group}}
       ```
 
-      When the membership of `people` changes, or when any property changes, the entire
-      `{{#group}}` block will be re-rendered.
+      This can be faster than the normal way that Handlebars re-renders items
+      in some cases.
 
-      An `{{#each}}` inside the `{{#group}}` helper can opt-out of the special group
-      behavior by passing the `groupedRows` option. For example:
+      If for some reason you have a group with more than one `#each`, you can make
+      one of the collections be updated in normal (non-grouped) fashion by setting
+      the option `groupedRows=true` (counter-intuitive, I know).
+
+      For example,
 
       ```handlebars
+      {{dealershipName}}
+
       {{#group}}
         {{#each dealers}}
-          {{! uses group's special behavior }}
           {{firstName}} {{lastName}}
         {{/each}}
 
         {{#each car in cars groupedRows=true}}
-          {{! does not use group's special behavior }}
           {{car.make}} {{car.model}} {{car.color}}
         {{/each}}
       {{/group}}
       ```
+      Any change to `dealershipName` or the `dealers` collection will cause the
+      entire group to be re-rendered. However, changes to the `cars` collection
+      will be re-rendered individually (as normal).
 
-      Any change to the `dealers` collection will cause the entire group to be re-rendered.
-      Changes to the `cars` collection will be re-rendered individually, as they are with
-      normal `{{#each}}` usage.
-
-      `{{#group}}` is implemented with an `itemViewClass`, so specifying an `itemViewClass`
-      on an `{{#each}}` will also disable the special re-rendering behavior.
+      Note that `group` behavior is also disabled by specifying an `itemViewClass`.
 
       @method each
       @for Ember.Handlebars.helpers
@@ -9137,13 +8864,11 @@ enifed("ember-handlebars/helpers/each",
       @param [path] {String} path
       @param [options] {Object} Handlebars key/value pairs of options
       @param [options.itemViewClass] {String} a path to a view class used for each item
-      @param [options.emptyViewClass] {String} a path to a view class used for each item
       @param [options.itemController] {String} name of a controller to be created for each item
       @param [options.groupedRows] {boolean} enable normal item-by-item rendering when inside a `#group` helper
     */
     function eachHelper(path, options) {
-      var ctx;
-      var helperName = 'each';
+      var ctx, helperName = 'each';
 
       if (arguments.length === 4) {
         Ember.assert("If you pass more than one argument to the each helper, it must be in the form #each foo in bar", arguments[1] === "in");
@@ -9179,7 +8904,8 @@ enifed("ember-handlebars/helpers/each",
       if (options.data.insideGroup && !options.hash.groupedRows && !options.hash.itemViewClass) {
         new GroupedEach(ctx, path, options).render();
       } else {
-        return helpers.collection.call(ctx, EmberHandlebars.EachView, options);
+        // ES6TODO: figure out how to do this without global lookup.
+        return helpers.collection.call(ctx, 'Ember.Handlebars.EachView', options);
       }
     }
 
@@ -9187,7 +8913,7 @@ enifed("ember-handlebars/helpers/each",
     __exports__.GroupedEach = GroupedEach;
     __exports__.eachHelper = eachHelper;
   });
-enifed("ember-handlebars/helpers/loc",
+define("ember-handlebars/helpers/loc",
   ["ember-runtime/system/string","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -9198,31 +8924,26 @@ enifed("ember-handlebars/helpers/loc",
     @submodule ember-handlebars
     */
 
+    // ES6TODO:
+    // Pretty sure this can be expressed as
+    // var locHelper EmberStringUtils.loc ?
+
     /**
       Calls [Ember.String.loc](/api/classes/Ember.String.html#method_loc) with the
       provided string.
 
-      This is a convenient way to localize text within a template:
-
-      ```javascript
-      Ember.STRINGS = {
-        '_welcome_': 'Bonjour'
-      };
-      ```
-
-      ```handlebars
-      <div class='message'>
-        {{loc '_welcome_'}}
-      </div>
-      ```
+      This is a convenient way to localize text. For example:
 
       ```html
-      <div class='message'>
-        Bonjour
-      </div>
+      <script type="text/x-handlebars" data-template-name="home">
+        {{loc "welcome"}}
+      </script>
       ```
 
-      See [Ember.String.loc](/api/classes/Ember.String.html#method_loc) for how to
+      Take note that `"welcome"` is a string and not an object
+      reference.
+
+      See [Ember.String.loc](/api/classes/Ember.String.html#method_loc) for how to 
       set up localized string references.
 
       @method loc
@@ -9230,9 +8951,11 @@ enifed("ember-handlebars/helpers/loc",
       @param {String} str The string to format
       @see {Ember.String#loc}
     */
-    __exports__["default"] = loc;
+    __exports__["default"] = function locHelper(str) {
+      return loc(str);
+    }
   });
-enifed("ember-handlebars/helpers/partial",
+define("ember-handlebars/helpers/partial",
   ["ember-metal/core","ember-metal/is_none","ember-handlebars/ext","ember-handlebars/helpers/binding","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -9343,17 +9066,17 @@ enifed("ember-handlebars/helpers/partial",
       template(context, { data: options.data });
     }
   });
-enifed("ember-handlebars/helpers/shared",
+define("ember-handlebars/helpers/shared",
   ["ember-handlebars/ext","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
     var handlebarsGet = __dependency1__.handlebarsGet;
 
     __exports__["default"] = function resolvePaths(options) {
-      var ret = [];
-      var contexts = options.contexts;
-      var roots = options.roots;
-      var data = options.data;
+      var ret = [],
+          contexts = options.contexts,
+          roots = options.roots,
+          data = options.data;
 
       for (var i=0, l=contexts.length; i<l; i++) {
         ret.push(handlebarsGet(roots[i], contexts[i], { data: data }));
@@ -9362,12 +9085,12 @@ enifed("ember-handlebars/helpers/shared",
       return ret;
     }
   });
-enifed("ember-handlebars/helpers/template",
+define("ember-handlebars/helpers/template",
   ["ember-metal/core","ember-handlebars-compiler","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
-    // Ember.deprecate;
+    // var emberDeprecate = Ember.deprecate;
 
     var EmberHandlebars = __dependency2__["default"];
     var helpers = EmberHandlebars.helpers;
@@ -9377,6 +9100,43 @@ enifed("ember-handlebars/helpers/template",
     */
 
     /**
+      `template` allows you to render a template from inside another template.
+      This allows you to re-use the same template in multiple places. For example:
+
+      ```html
+      <script type="text/x-handlebars" data-template-name="logged_in_user">
+        {{#with loggedInUser}}
+          Last Login: {{lastLogin}}
+          User Info: {{template "user_info"}}
+        {{/with}}
+      </script>
+      ```
+
+      ```html
+      <script type="text/x-handlebars" data-template-name="user_info">
+        Name: <em>{{name}}</em>
+        Karma: <em>{{karma}}</em>
+      </script>
+      ```
+
+      ```handlebars
+      {{#if isUser}}
+        {{template "user_info"}}
+      {{else}}
+        {{template "unlogged_user_info"}}
+      {{/if}}
+      ```
+
+      This helper looks for templates in the global `Ember.TEMPLATES` hash. If you
+      add `<script>` tags to your page with the `data-template-name` attribute set,
+      they will be compiled and placed in this hash automatically.
+
+      You can also manually register templates by adding them to the hash:
+
+      ```javascript
+      Ember.TEMPLATES["my_cool_template"] = Ember.Handlebars.compile('<b>{{user}}</b>');
+      ```
+
       @deprecated
       @method template
       @for Ember.Handlebars.helpers
@@ -9390,7 +9150,7 @@ enifed("ember-handlebars/helpers/template",
       return helpers.partial.apply(this, arguments);
     }
   });
-enifed("ember-handlebars/helpers/unbound",
+define("ember-handlebars/helpers/unbound",
   ["ember-handlebars-compiler","ember-handlebars/helpers/binding","ember-handlebars/ext","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -9430,9 +9190,9 @@ enifed("ember-handlebars/helpers/unbound",
       @return {String} HTML string
     */
     __exports__["default"] = function unboundHelper(property, fn) {
-      var options = arguments[arguments.length - 1];
-      var container = options.data.view.container;
-      var helper, context, out, ctx;
+      var options = arguments[arguments.length - 1],
+          container = options.data.view.container,
+          helper, context, out, ctx;
 
       ctx = this;
       if (arguments.length > 2) {
@@ -9448,9 +9208,9 @@ enifed("ember-handlebars/helpers/unbound",
       return handlebarsGet(context, property, fn);
     }
   });
-enifed("ember-handlebars/helpers/view",
-  ["ember-metal/core","ember-runtime/system/object","ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-views/system/jquery","ember-views/views/view","ember-metal/binding","ember-metal/keys","ember-handlebars/ext","ember-runtime/system/string","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+define("ember-handlebars/helpers/view",
+  ["ember-metal/core","ember-runtime/system/object","ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-views/system/jquery","ember-views/views/view","ember-metal/binding","ember-handlebars/ext","ember-runtime/system/string","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
     /*globals Handlebars */
 
@@ -9470,19 +9230,17 @@ enifed("ember-handlebars/helpers/view",
     var jQuery = __dependency6__["default"];
     var View = __dependency7__["default"];
     var isGlobalPath = __dependency8__.isGlobalPath;
-    var keys = __dependency9__["default"];
-    var normalizePath = __dependency10__.normalizePath;
-    var handlebarsGet = __dependency10__.handlebarsGet;
-    var handlebarsGetView = __dependency10__.handlebarsGetView;
-    var EmberString = __dependency11__["default"];
+    var normalizePath = __dependency9__.normalizePath;
+    var handlebarsGet = __dependency9__.handlebarsGet;
+    var EmberString = __dependency10__["default"];
 
 
-    var LOWERCASE_A_Z = /^[a-z]/;
-    var VIEW_PREFIX = /^view\./;
+    var LOWERCASE_A_Z = /^[a-z]/,
+        VIEW_PREFIX = /^view\./;
 
     function makeBindings(thisContext, options) {
-      var hash = options.hash;
-      var hashType = options.hashTypes;
+      var hash = options.hash,
+          hashType = options.hashTypes;
 
       for (var prop in hash) {
         if (hashType[prop] === 'ID') {
@@ -9510,72 +9268,74 @@ enifed("ember-handlebars/helpers/view",
     }
 
     var ViewHelper = EmberObject.create({
-      propertiesFromHTMLOptions: function(options) {
-        var hash    = options.hash;
-        var data    = options.data;
-        var classes = hash['class'];
 
-        var extensions = {
-          helperName: options.helperName || ''
-        };
+      propertiesFromHTMLOptions: function(options) {
+        var hash = options.hash, data = options.data;
+        var extensions = {},
+            classes = hash['class'],
+            dup = false;
 
         if (hash.id) {
           extensions.elementId = hash.id;
+          dup = true;
         }
 
         if (hash.tag) {
           extensions.tagName = hash.tag;
+          dup = true;
         }
 
         if (classes) {
           classes = classes.split(' ');
           extensions.classNames = classes;
+          dup = true;
         }
 
         if (hash.classBinding) {
           extensions.classNameBindings = hash.classBinding.split(' ');
+          dup = true;
         }
 
         if (hash.classNameBindings) {
-          if (extensions.classNameBindings === undefined) {
-            extensions.classNameBindings = [];
-          }
+          if (extensions.classNameBindings === undefined) extensions.classNameBindings = [];
           extensions.classNameBindings = extensions.classNameBindings.concat(hash.classNameBindings.split(' '));
+          dup = true;
         }
 
         if (hash.attributeBindings) {
           Ember.assert("Setting 'attributeBindings' via Handlebars is not allowed. Please subclass Ember.View and set it there instead.");
           extensions.attributeBindings = null;
+          dup = true;
+        }
+
+        if (dup) {
+          hash = jQuery.extend({}, hash);
+          delete hash.id;
+          delete hash.tag;
+          delete hash['class'];
+          delete hash.classBinding;
         }
 
         // Set the proper context for all bindings passed to the helper. This applies to regular attribute bindings
         // as well as class name bindings. If the bindings are local, make them relative to the current context
         // instead of the view.
         var path;
-        var hashKeys = keys(hash);
 
-        for (var i = 0, l = hashKeys.length; i < l; i++) {
-          var prop      = hashKeys[i];
-          var isBinding = IS_BINDING.test(prop);
-
-          if (prop !== 'classNameBindings') {
-            extensions[prop] = hash[prop];
-          }
+        // Evaluate the context of regular attribute bindings:
+        for (var prop in hash) {
+          if (!hash.hasOwnProperty(prop)) { continue; }
 
           // Test if the property ends in "Binding"
-          if (isBinding && typeof extensions[prop] === 'string') {
+          if (IS_BINDING.test(prop) && typeof hash[prop] === 'string') {
             path = this.contextualizeBindingPath(hash[prop], data);
-            if (path) {
-              extensions[prop] = path;
-            }
+            if (path) { hash[prop] = path; }
           }
         }
 
+        // Evaluate the context of class name bindings:
         if (extensions.classNameBindings) {
-          // Evaluate the context of class name bindings:
-          for (var j = 0, k = extensions.classNameBindings.length; j < k; j++) {
-            var full = extensions.classNameBindings[j];
-
+          for (var b in extensions.classNameBindings) {
+            var full = extensions.classNameBindings[b];
             if (typeof full === 'string') {
               // Contextualize the path of classNameBinding so this:
               //
@@ -9585,17 +9345,15 @@ enifed("ember-handlebars/helpers/view",
               //
               //     classNameBinding="_parentView.context.isGreen:green"
               var parsedPath = View._parsePropertyPath(full);
-              if (parsedPath.path !== '') {
-                path = this.contextualizeBindingPath(parsedPath.path, data);
-                if (path) {
-                  extensions.classNameBindings[j] = path + parsedPath.classNames;
-                }
+              if(parsedPath.path !== '') {
+                path = this.contextualizeBindingPath(parsedPath.path, data); 
+                if (path) { extensions.classNameBindings[b] = path + parsedPath.classNames; }
               }
             }
           }
         }
 
-        return extensions;
+        return jQuery.extend(hash, extensions);
       },
 
       // Transform bindings from the current context to a context that can be evaluated within the view.
@@ -9617,25 +9375,43 @@ enifed("ember-handlebars/helpers/view",
       },
 
       helper: function(thisContext, path, options) {
-        var data = options.data;
-        var fn   = options.fn;
-        var newView;
-        var newViewProto;
+        var data = options.data,
+            fn = options.fn,
+            newView;
 
         makeBindings(thisContext, options);
 
-        var container = this.container || (data && data.view && data.view.container);
-        newView = handlebarsGetView(thisContext, path, container, options);
+        if ('string' === typeof path) {
+          var lookup;
+          // TODO: this is a lame conditional, this should likely change
+          // but something along these lines will likely need to be added
+          // as deprecation warnings
+          //
+          if (options.types[0] === 'STRING' && LOWERCASE_A_Z.test(path) && !VIEW_PREFIX.test(path)) {
+            lookup = path;
+          } else {
+            newView = handlebarsGet(thisContext, path, options);
+            if (typeof newView === 'string') {
+              lookup = newView;
+            }
+          }
 
-        if (View.detectInstance(newView)) {
-          newViewProto = newView;
+          if (lookup) {
+            Ember.assert("View requires a container", !!data.view.container);
+            newView = data.view.container.lookupFactory('view:' + lookup);
+          }
+
+          Ember.assert("Unable to find view at path '" + path + "'", !!newView);
         } else {
-          newViewProto = newView.proto();
+          newView = path;
         }
 
+        Ember.assert(EmberString.fmt('You must pass a view to the #view helper, not %@ (%@)', [path, newView]), View.detect(newView) || View.detectInstance(newView));
+
         var viewOptions = this.propertiesFromHTMLOptions(options, thisContext);
         var currentView = data.view;
         viewOptions.templateData = data;
+        var newViewProto = newView.proto ? newView.proto() : newView;
 
         if (fn) {
           Ember.assert("You cannot provide a template block if you also specified a templateName", !get(viewOptions, 'templateName') && !get(newViewProto, 'templateName'));
@@ -9648,33 +9424,9 @@ enifed("ember-handlebars/helpers/view",
           viewOptions._context = thisContext;
         }
 
-        currentView.appendChild(newView, viewOptions);
-      },
-
-      instanceHelper: function(thisContext, newView, options) {
-        var data = options.data;
-        var fn   = options.fn;
-
-        makeBindings(thisContext, options);
-
-        Ember.assert(
-          'Only a instance of a view may be passed to the ViewHelper.instanceHelper',
-          View.detectInstance(newView)
-        );
-
-        var viewOptions = this.propertiesFromHTMLOptions(options, thisContext);
-        var currentView = data.view;
-        viewOptions.templateData = data;
-
-        if (fn) {
-          Ember.assert("You cannot provide a template block if you also specified a templateName", !get(viewOptions, 'templateName') && !get(newView, 'templateName'));
-          viewOptions.template = fn;
-        }
-
-        // We only want to override the `_context` computed property if there is
-        // no specified controller. See View#_context for more information.
-        if (!newView.controller && !newView.controllerBinding && !viewOptions.controller && !viewOptions.controllerBinding) {
-          viewOptions._context = thisContext;
+        // for instrumentation
+        if (options.helperName) {
+          viewOptions.helperName = options.helperName;
         }
 
         currentView.appendChild(newView, viewOptions);
@@ -9785,7 +9537,7 @@ enifed("ember-handlebars/helpers/view",
       specify a path to a custom view class.
 
       ```handlebars
-      {{#view "custom"}}{{! will look up App.CustomView }}
+      {{#view "MyApp.CustomView"}}
         hello.
       {{/view}}
       ```
@@ -9799,7 +9551,7 @@ enifed("ember-handlebars/helpers/view",
         innerViewClass: Ember.View.extend({
           classNames: ['a-custom-view-class-as-property']
         }),
-        template: Ember.Handlebars.compile('{{#view view.innerViewClass}} hi {{/view}}')
+        template: Ember.Handlebars.compile('{{#view "view.innerViewClass"}} hi {{/view}}')
       });
 
       MyApp.OuterView.create().appendTo('body');
@@ -9822,21 +9574,8 @@ enifed("ember-handlebars/helpers/view",
       supplying a block. Attempts to use both a `templateName` option and supply a
       block will throw an error.
 
-      ```javascript
-      var App = Ember.Application.create();
-      App.WithTemplateDefinedView = Ember.View.extend({
-        templateName: 'defined-template'
-      });
-      ```
-
       ```handlebars
-      {{! application.hbs }}
-      {{view 'with-template-defined'}}
-      ```
-
-      ```handlebars
-      {{! defined-template.hbs }}
-      Some content for the defined template view.
+      {{view "MyApp.ViewWithATemplateDefined"}}
       ```
 
       ### `viewName` property
@@ -9866,11 +9605,8 @@ enifed("ember-handlebars/helpers/view",
       // and get an instance of the registered `view:toplevel`
       if (path && path.data && path.data.isRenderData) {
         options = path;
-        if (options.data && options.data.view && options.data.view.container) {
-          path = options.data.view.container.lookupFactory('view:toplevel');
-        } else {
-          path = View;
-        }
+        Ember.assert('{{view}} helper requires parent view to have a container but none was found. This usually happens when you are manually-managing views.', !!options.data.view.container);
+        path = options.data.view.container.lookupFactory('view:toplevel');
       }
 
       options.helperName = options.helperName || 'view';
@@ -9880,7 +9616,7 @@ enifed("ember-handlebars/helpers/view",
 
     __exports__.viewHelper = viewHelper;
   });
-enifed("ember-handlebars/helpers/yield",
+define("ember-handlebars/helpers/yield",
   ["ember-metal/core","ember-metal/property_get","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -9992,7 +9728,7 @@ enifed("ember-handlebars/helpers/yield",
       view._yield(this, options);
     }
   });
-enifed("ember-handlebars/loader",
+define("ember-handlebars/loader",
   ["ember-handlebars/component_lookup","ember-views/system/jquery","ember-metal/error","ember-runtime/system/lazy_load","ember-handlebars-compiler","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -10036,12 +9772,12 @@ enifed("ember-handlebars/loader",
 
         var compile = (script.attr('type') === 'text/x-raw-handlebars') ?
                       jQuery.proxy(Handlebars.compile, Handlebars) :
-                      jQuery.proxy(EmberHandlebars.compile, EmberHandlebars);
-        // Get the name of the script, used by Ember.View's templateName property.
-        // First look for data-template-name attribute, then fall back to its
-        // id if no name is found.
-        var templateName = script.attr('data-template-name') || script.attr('id') || 'application';
-        var template = compile(script.html());
+                      jQuery.proxy(EmberHandlebars.compile, EmberHandlebars),
+          // Get the name of the script, used by Ember.View's templateName property.
+          // First look for data-template-name attribute, then fall back to its
+          // id if no name is found.
+          templateName = script.attr('data-template-name') || script.attr('id') || 'application',
+          template = compile(script.html());
 
         // Check if template of same name already exists
         if (Ember.TEMPLATES[templateName] !== undefined) {
@@ -10090,7 +9826,7 @@ enifed("ember-handlebars/loader",
 
     __exports__["default"] = bootstrap;
   });
-enifed("ember-handlebars/string",
+define("ember-handlebars/string",
   ["ember-runtime/system/string","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -10112,9 +9848,6 @@ enifed("ember-handlebars/string",
       @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
     */
     function htmlSafe(str) {
-      if (typeof str !== 'string') {
-        str = ''+str;
-      }
       return new Handlebars.SafeString(str);
     }
 
@@ -10141,9 +9874,9 @@ enifed("ember-handlebars/string",
 
     __exports__["default"] = htmlSafe;
   });
-enifed("ember-handlebars/views/handlebars_bound_view",
-  ["ember-handlebars-compiler","ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-views/views/view","ember-handlebars/string","ember-views/views/states","ember-handlebars/views/metamorph_view","ember-handlebars/ext","ember-metal/utils","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
+define("ember-handlebars/views/handlebars_bound_view",
+  ["ember-handlebars-compiler","ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-views/views/view","ember-views/views/states","ember-handlebars/views/metamorph_view","ember-handlebars/ext","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
     /*globals Handlebars, Metamorph:true */
     /*jshint newcap:false*/
@@ -10162,33 +9895,34 @@ enifed("ember-handlebars/views/handlebars_bound_view",
     // Ember.K
     var K = Ember.K;
 
+    var Metamorph = requireModule('metamorph');
+
     var EmberError = __dependency3__["default"];
     var get = __dependency4__.get;
     var set = __dependency5__.set;
     var merge = __dependency6__["default"];
     var run = __dependency7__["default"];
-    var View = __dependency8__["default"];
-    var htmlSafe = __dependency9__["default"];
+    var computed = __dependency8__.computed;
+    var View = __dependency9__["default"];
     var cloneStates = __dependency10__.cloneStates;
     var states = __dependency10__.states;
     var viewStates = states;
 
     var _MetamorphView = __dependency11__["default"];
     var handlebarsGet = __dependency12__.handlebarsGet;
-    var uuid = __dependency13__.uuid;
 
     function SimpleHandlebarsView(path, pathRoot, isEscaped, templateData) {
       this.path = path;
       this.pathRoot = pathRoot;
       this.isEscaped = isEscaped;
       this.templateData = templateData;
-      this[Ember.GUID_KEY] = uuid();
+
       this._lastNormalizedValue = undefined;
+      this.morph = Metamorph();
       this.state = 'preRender';
       this.updateId = null;
       this._parentView = null;
       this.buffer = null;
-      this._morph = null;
     }
 
     SimpleHandlebarsView.prototype = {
@@ -10214,7 +9948,6 @@ enifed("ember-handlebars/views/handlebars_bound_view",
       normalizedValue: function() {
         var path = this.path;
         var pathRoot = this.pathRoot;
-        var escape = this.isEscaped;
         var result, templateData;
 
         // Use the pathRoot as the result if no path is provided. This
@@ -10228,17 +9961,33 @@ enifed("ember-handlebars/views/handlebars_bound_view",
           result = handlebarsGet(pathRoot, path, { data: templateData });
         }
 
-        if (!escape && !(result instanceof SafeString)) {
-          result = htmlSafe(result);
-        }
-
         return result;
       },
 
-      render: function(buffer) {
-        var value = this.normalizedValue();
-        this._lastNormalizedValue = value;
-        buffer._element = value;
+      renderToBuffer: function(buffer) {
+        var string = '';
+
+        string += this.morph.startTag();
+        string += this.render();
+        string += this.morph.endTag();
+
+        buffer.push(string);
+      },
+
+      render: function(value) {
+        // If not invoked via a triple-mustache ({{{foo}}}), escape
+        // the content of the template.
+        var escape = this.isEscaped;
+        var result = value || this.normalizedValue();
+        this._lastNormalizedValue = result;
+        if (result === null || result === undefined) {
+          result = "";
+        } else if (!(result instanceof SafeString)) {
+          result = String(result);
+        }
+
+        if (escape) { result = Handlebars.Utils.escapeExpression(result); }
+        return result;
       },
 
       rerender: function() {
@@ -10253,16 +10002,15 @@ enifed("ember-handlebars/views/handlebars_bound_view",
             this.updateId = run.scheduleOnce('render', this, 'update');
             break;
         }
+
         return this;
       },
 
       update: function () {
         this.updateId = null;
         var value = this.normalizedValue();
-        // doesn't diff SafeString instances
         if (value !== this._lastNormalizedValue) {
-          this._lastNormalizedValue = value;
-          this._morph.update(value);
+          this.morph.html(this.render(value));
         }
       },
 
@@ -10385,10 +10133,10 @@ enifed("ember-handlebars/views/handlebars_bound_view",
       pathRoot: null,
 
       normalizedValue: function() {
-        var path = get(this, 'path');
-        var pathRoot  = get(this, 'pathRoot');
-        var valueNormalizer = get(this, 'valueNormalizerFunc');
-        var result, templateData;
+        var path = get(this, 'path'),
+            pathRoot  = get(this, 'pathRoot'),
+            valueNormalizer = get(this, 'valueNormalizerFunc'),
+            result, templateData;
 
         // Use the pathRoot as the result if no path is provided. This
         // happens if the path is `this`, which gets normalized into
@@ -10430,15 +10178,14 @@ enifed("ember-handlebars/views/handlebars_bound_view",
         // the content of the template.
         var escape = get(this, 'isEscaped');
 
-        var shouldDisplay = get(this, 'shouldDisplayFunc');
-        var preserveContext = get(this, 'preserveContext');
-        var context = get(this, 'previousContext');
+        var shouldDisplay = get(this, 'shouldDisplayFunc'),
+            preserveContext = get(this, 'preserveContext'),
+            context = get(this, 'previousContext');
 
-        var inverseTemplate = get(this, 'inverseTemplate');
-        var displayTemplate = get(this, 'displayTemplate');
+        var inverseTemplate = get(this, 'inverseTemplate'),
+            displayTemplate = get(this, 'displayTemplate');
 
         var result = this.normalizedValue();
-
         this._lastNormalizedValue = result;
 
         // First, test the conditional to see if we should
@@ -10488,30 +10235,93 @@ enifed("ember-handlebars/views/handlebars_bound_view",
     __exports__._HandlebarsBoundView = _HandlebarsBoundView;
     __exports__.SimpleHandlebarsView = SimpleHandlebarsView;
   });
-enifed("ember-handlebars/views/metamorph_view",
-  ["ember-metal/core","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-metal/run_loop","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+define("ember-handlebars/views/metamorph_view",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-metal/run_loop","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     /* global Metamorph:true */
 
     /*jshint newcap:false*/
     var Ember = __dependency1__["default"];
     // Ember.deprecate
+    // var emberDeprecate = Ember.deprecate;
 
-    var CoreView = __dependency2__["default"];
-    var View = __dependency3__["default"];
-    var Mixin = __dependency4__.Mixin;
-    var run = __dependency5__["default"];
+    var get = __dependency2__.get;
+    var set = __dependency3__["default"];
+
+    var CoreView = __dependency4__["default"];
+    var View = __dependency5__["default"];
+    var Mixin = __dependency6__.Mixin;
+    var run = __dependency7__["default"];
 
     /**
     @module ember
     @submodule ember-handlebars
     */
 
+    var Metamorph = requireModule('metamorph');
+
     function notifyMutationListeners() {
       run.once(View, 'notifyMutationListeners');
     }
 
+    // DOMManager should just abstract dom manipulation between jquery and metamorph
+    var DOMManager = {
+      remove: function(view) {
+        view.morph.remove();
+        notifyMutationListeners();
+      },
+
+      prepend: function(view, html) {
+        view.morph.prepend(html);
+        notifyMutationListeners();
+      },
+
+      after: function(view, html) {
+        view.morph.after(html);
+        notifyMutationListeners();
+      },
+
+      html: function(view, html) {
+        view.morph.html(html);
+        notifyMutationListeners();
+      },
+
+      // This is messed up.
+      replace: function(view) {
+        var morph = view.morph;
+
+        view._transitionTo('preRender');
+
+        run.schedule('render', this, function renderMetamorphView() {
+          if (view.isDestroying) { return; }
+
+          view.clearRenderedChildren();
+          var buffer = view.renderToBuffer();
+
+          view.invokeRecursively(function(view) {
+            view.propertyWillChange('element');
+          });
+          view.triggerRecursively('willInsertElement');
+
+          morph.replaceWith(buffer.string());
+          view._transitionTo('inDOM');
+
+          view.invokeRecursively(function(view) {
+            view.propertyDidChange('element');
+          });
+          view.triggerRecursively('didInsertElement');
+
+          notifyMutationListeners();
+        });
+      },
+
+      empty: function(view) {
+        view.morph.html("");
+        notifyMutationListeners();
+      }
+    };
+
     // The `morph` and `outerHTML` properties are internal only
     // and not observable.
 
@@ -10528,10 +10338,31 @@ enifed("ember-handlebars/views/metamorph_view",
 
       init: function() {
         this._super();
+        this.morph = Metamorph();
         Ember.deprecate('Supplying a tagName to Metamorph views is unreliable and is deprecated. You may be setting the tagName on a Handlebars helper that creates a Metamorph.', !this.tagName);
-      }
+      },
+
+      beforeRender: function(buffer) {
+        buffer.push(this.morph.startTag());
+        buffer.pushOpeningTag();
+      },
+
+      afterRender: function(buffer) {
+        buffer.pushClosingTag();
+        buffer.push(this.morph.endTag());
+      },
+
+      createElement: function() {
+        var buffer = this.renderToBuffer();
+        this.outerHTML = buffer.string();
+        this.clearBuffer();
+      },
+
+      domManager: DOMManager
     });
     __exports__._Metamorph = _Metamorph;
+    var _wrapMap = Metamorph._wrapMap;
+    __exports__._wrapMap = _wrapMap;
     /**
       @class _MetamorphView
       @namespace Ember
@@ -10551,308 +10382,9 @@ enifed("ember-handlebars/views/metamorph_view",
     var _SimpleMetamorphView = CoreView.extend(_Metamorph);
     __exports__._SimpleMetamorphView = _SimpleMetamorphView;__exports__["default"] = View.extend(_Metamorph);
   });
-enifed("ember-metal-views",
-  ["ember-metal-views/renderer","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var Renderer = __dependency1__["default"];
-    __exports__.Renderer = Renderer;
-  });
-enifed("ember-metal-views/renderer",
-  ["morph","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var DOMHelper = __dependency1__.DOMHelper;
-
-    function Renderer() {
-      this._uuid = 0;
-      this._views = new Array(2000);
-      this._queue = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
-      this._parents = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
-      this._elements = new Array(17);
-      this._inserts = {};
-      this._dom = new DOMHelper();
-    }
-
-    function Renderer_renderTree(_view, _parentView, _insertAt) {
-      var views = this._views;
-      views[0] = _view;
-      var insertAt = _insertAt === undefined ? -1 : _insertAt;
-      var index = 0;
-      var total = 1;
-      var levelBase = _parentView ? _parentView._level+1 : 0;
-
-      var root = _parentView == null ? _view : _parentView._root;
-
-      // if root view has a _morph assigned
-      var willInsert = !!root._morph;
-
-      var queue = this._queue;
-      queue[0] = 0;
-      var length = 1;
-
-      var parentIndex = -1;
-      var parents = this._parents;
-      var parent = _parentView || null;
-      var elements = this._elements;
-      var element = null;
-      var contextualElement = null;
-      var level = 0;
-
-      var view = _view;
-      var children, i, l, child;
-      while (length) {
-        elements[level] = element;
-        if (!view._morph) {
-          // ensure props we add are in same order
-          view._morph = null;
-        }
-        view._root = root;
-        this.uuid(view);
-        view._level = levelBase + level;
-        if (view._elementCreated) {
-          this.remove(view, false, true);
-        }
-
-        this.willCreateElement(view);
-
-        contextualElement = view._morph && view._morph.contextualElement;
-        if (!contextualElement && parent && parent._childViewsMorph) {
-          contextualElement = parent._childViewsMorph.contextualElement;
-        }
-        if (!contextualElement && view._didCreateElementWithoutMorph) {
-          // This code path is only used by createElement and rerender when createElement
-          // was previously called on a view.
-          contextualElement = document.body;
-        }
-        Ember.assert("Required contextualElement for view "+_view+" is missing", contextualElement);
-        element = this.createElement(view, contextualElement);
-
-        parents[level++] = parentIndex;
-        parentIndex = index;
-        parent = view;
-
-        // enqueue for end
-        queue[length++] = index;
-        // enqueue children
-        children = this.childViews(view);
-        if (children) {
-          for (i=children.length-1;i>=0;i--) {
-            child = children[i];
-            index = total++;
-            views[index] = child;
-            queue[length++] = index;
-            view = child;
-          }
-        }
-
-        index = queue[--length];
-        view = views[index];
-
-        while (parentIndex === index) {
-          level--;
-          view._elementCreated = true;
-          this.didCreateElement(view);
-          if (willInsert) {
-            this.willInsertElement(view);
-          }
-
-          if (level === 0) {
-            length--;
-            break;
-          }
-
-          parentIndex = parents[level];
-          parent = parentIndex === -1 ? _parentView : views[parentIndex];
-          this.insertElement(view, parent, element, -1);
-          index = queue[--length];
-          view = views[index];
-          element = elements[level];
-          elements[level] = null;
-        }
-      }
-
-      this.insertElement(view, _parentView, element, insertAt);
-
-      for (i=total-1;i>=0;i--) {
-        if (willInsert) {
-          views[i]._elementInserted = true;
-          this.didInsertElement(views[i]);
-        }
-        views[i] = null;
-      }
-
-      return element;
-    }
-
-    Renderer.prototype.uuid = function Renderer_uuid(view) {
-      if (view._uuid === undefined) {
-        view._uuid = ++this._uuid;
-        view._renderer = this;
-      } // else assert(view._renderer === this)
-      return view._uuid;
-    };
-
-    Renderer.prototype.scheduleInsert =
-      function Renderer_scheduleInsert(view, morph) {
-        if (view._morph || view._elementCreated) {
-          throw new Error("You cannot insert a View that has already been rendered");
-        }
-        Ember.assert("You cannot insert a View without a morph", morph);
-        view._morph = morph;
-        var viewId = this.uuid(view);
-        this._inserts[viewId] = this.scheduleRender(this, function() {
-          this._inserts[viewId] = null;
-          this.renderTree(view);
-        });
-      };
-
-    Renderer.prototype.appendTo =
-      function Renderer_appendTo(view, target) {
-        var morph = this._dom.appendMorph(target);
-        this.scheduleInsert(view, morph);
-      };
-
-    Renderer.prototype.replaceIn =
-      function Renderer_replaceIn(view, target) {
-        var morph = this._dom.createMorph(target, null, null);
-        this.scheduleInsert(view, morph);
-      };
-
-    function Renderer_remove(_view, shouldDestroy, reset) {
-      var viewId = this.uuid(_view);
-
-      if (this._inserts[viewId]) {
-        this.cancelRender(this._inserts[viewId]);
-        this._inserts[viewId] = undefined;
-      }
-
-      if (!_view._elementCreated) {
-        return;
-      }
-
-      var removeQueue = [];
-      var destroyQueue = [];
-      var morph = _view._morph;
-      var  idx, len, view, staticChildren, queue,
-        childViews, i, l, parentView;
-
-      removeQueue.push(_view);
-
-      for (idx=0; idx<removeQueue.length; idx++) {
-        view = removeQueue[idx];
-
-        if (!shouldDestroy && view._childViewsMorph) {
-          queue = removeQueue;
-        } else {
-          queue = destroyQueue;
-        }
-
-        this.beforeRemove(removeQueue[idx]);
-
-        childViews = view._childViews;
-        if (childViews) {
-          for (i=0,l=childViews.length; i<l; i++) {
-            queue.push(childViews[i]);
-          }
-        }
-      }
-
-      for (idx=0; idx<destroyQueue.length; idx++) {
-        view = destroyQueue[idx];
-
-        this.beforeRemove(destroyQueue[idx]);
-
-        childViews = view._childViews;
-        if (childViews) {
-          for (i=0,l=childViews.length; i<l; i++) {
-            destroyQueue.push(childViews[i]);
-          }
-        }
-      }
-
-      // destroy DOM from root insertion
-      if (morph && !reset) {
-        morph.destroy();
-      }
-
-      for (idx=0, len=removeQueue.length; idx < len; idx++) {
-        this.afterRemove(removeQueue[idx], false);
-      }
-
-      for (idx=0, len=destroyQueue.length; idx < len; idx++) {
-        this.afterRemove(destroyQueue[idx], true);
-      }
-
-      if (reset) {
-        _view._morph = morph;
-      }
-    }
-
-    function Renderer_insertElement(view, parentView, element, index) {
-      if (element === null || element === undefined) return;
-      if (view._morph) {
-        view._morph.update(element);
-      } else if (parentView) {
-        if (index === -1) {
-          view._morph = parentView._childViewsMorph.append(element);
-        } else {
-          view._morph = parentView._childViewsMorph.insert(index, element);
-        }
-      }
-    }
-
-    function Renderer_beforeRemove(view) {
-      if (view._elementCreated) {
-        this.willDestroyElement(view);
-      }
-      if (view._elementInserted) {
-        this.willRemoveElement(view);
-      }
-    }
-
-    function Renderer_afterRemove(view, shouldDestroy) {
-      view._elementInserted = false;
-      view._morph = null;
-      view._childViewsMorph = null;
-      if (view._elementCreated) {
-        view._elementCreated = false;
-        this.didDestroyElement(view);
-      }
-      if (shouldDestroy) {
-        this.destroyView(view);
-      }
-    }
-
-    Renderer.prototype.remove = Renderer_remove;
-    Renderer.prototype.destroy = function (view) {
-      this.remove(view, true);
-    };
-
-    Renderer.prototype.renderTree = Renderer_renderTree;
-    Renderer.prototype.insertElement = Renderer_insertElement;
-    Renderer.prototype.beforeRemove = Renderer_beforeRemove;
-    Renderer.prototype.afterRemove = Renderer_afterRemove;
-
-    /// HOOKS
-    var noop = function () {};
-
-    Renderer.prototype.willCreateElement = noop; // inBuffer
-    Renderer.prototype.createElement = noop; // renderToBuffer or createElement
-    Renderer.prototype.didCreateElement = noop; // hasElement
-    Renderer.prototype.willInsertElement = noop; // will place into DOM
-    Renderer.prototype.didInsertElement = noop; // inDOM // placed into DOM
-    Renderer.prototype.willRemoveElement = noop; // removed from DOM  willDestroyElement currently paired with didInsertElement
-    Renderer.prototype.willDestroyElement = noop; // willClearRender (currently balanced with render) this is now paired with createElement
-    Renderer.prototype.didDestroyElement = noop; // element destroyed so view.destroy shouldn't try to remove it removedFromDOM
-    Renderer.prototype.destroyView = noop;
-    Renderer.prototype.childViews = noop;
-
-    __exports__["default"] = Renderer;
-  });
-enifed("ember-metal",
-  ["ember-metal/core","ember-metal/merge","ember-metal/instrumentation","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/cache","ember-metal/platform","ember-metal/array","ember-metal/logger","ember-metal/property_get","ember-metal/events","ember-metal/observer_set","ember-metal/property_events","ember-metal/properties","ember-metal/property_set","ember-metal/map","ember-metal/get_properties","ember-metal/set_properties","ember-metal/watch_key","ember-metal/chains","ember-metal/watch_path","ember-metal/watching","ember-metal/expand_properties","ember-metal/computed","ember-metal/computed_macros","ember-metal/observer","ember-metal/mixin","ember-metal/binding","ember-metal/run_loop","ember-metal/libraries","ember-metal/is_none","ember-metal/is_empty","ember-metal/is_blank","ember-metal/is_present","ember-metal/keys","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __dependency34__, __dependency35__, __dependency36__, __exports__) {
+define("ember-metal",
+  ["ember-metal/core","ember-metal/merge","ember-metal/instrumentation","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/platform","ember-metal/array","ember-metal/logger","ember-metal/property_get","ember-metal/events","ember-metal/observer_set","ember-metal/property_events","ember-metal/properties","ember-metal/property_set","ember-metal/map","ember-metal/get_properties","ember-metal/set_properties","ember-metal/watch_key","ember-metal/chains","ember-metal/watch_path","ember-metal/watching","ember-metal/expand_properties","ember-metal/computed","ember-metal/computed_macros","ember-metal/observer","ember-metal/mixin","ember-metal/binding","ember-metal/run_loop","ember-metal/libraries","ember-metal/is_none","ember-metal/is_empty","ember-metal/is_blank","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __exports__) {
     "use strict";
     /**
     Ember Metal
@@ -10870,6 +10402,7 @@ enifed("ember-metal",
     var reset = __dependency3__.reset;
     var generateGuid = __dependency4__.generateGuid;
     var GUID_KEY = __dependency4__.GUID_KEY;
+    var GUID_PREFIX = __dependency4__.GUID_PREFIX;
     var guidFor = __dependency4__.guidFor;
     var META_DESC = __dependency4__.META_DESC;
     var EMPTY_META = __dependency4__.EMPTY_META;
@@ -10891,103 +10424,100 @@ enifed("ember-metal",
     var uuid = __dependency4__.uuid;
     var EmberError = __dependency5__["default"];
     var EnumerableUtils = __dependency6__["default"];
-    var Cache = __dependency7__["default"];
-    var create = __dependency8__.create;
-    var hasPropertyAccessors = __dependency8__.hasPropertyAccessors;
-    var filter = __dependency9__.filter;
-    var forEach = __dependency9__.forEach;
-    var indexOf = __dependency9__.indexOf;
-    var map = __dependency9__.map;
-    var Logger = __dependency10__["default"];
 
-    var get = __dependency11__.get;
-    var getWithDefault = __dependency11__.getWithDefault;
-    var normalizeTuple = __dependency11__.normalizeTuple;
-    var _getPath = __dependency11__._getPath;
+    var create = __dependency7__.create;
+    var platform = __dependency7__.platform;
+    var map = __dependency8__.map;
+    var forEach = __dependency8__.forEach;
+    var filter = __dependency8__.filter;
+    var indexOf = __dependency8__.indexOf;
+    var Logger = __dependency9__["default"];
 
-    var on = __dependency12__.on;
-    var addListener = __dependency12__.addListener;
-    var removeListener = __dependency12__.removeListener;
-    var suspendListener = __dependency12__.suspendListener;
-    var suspendListeners = __dependency12__.suspendListeners;
-    var sendEvent = __dependency12__.sendEvent;
-    var hasListeners = __dependency12__.hasListeners;
-    var watchedEvents = __dependency12__.watchedEvents;
-    var listenersFor = __dependency12__.listenersFor;
-    var listenersDiff = __dependency12__.listenersDiff;
-    var listenersUnion = __dependency12__.listenersUnion;
+    var get = __dependency10__.get;
+    var getWithDefault = __dependency10__.getWithDefault;
+    var normalizeTuple = __dependency10__.normalizeTuple;
+    var _getPath = __dependency10__._getPath;
 
-    var ObserverSet = __dependency13__["default"];
+    var on = __dependency11__.on;
+    var addListener = __dependency11__.addListener;
+    var removeListener = __dependency11__.removeListener;
+    var suspendListener = __dependency11__.suspendListener;
+    var suspendListeners = __dependency11__.suspendListeners;
+    var sendEvent = __dependency11__.sendEvent;
+    var hasListeners = __dependency11__.hasListeners;
+    var watchedEvents = __dependency11__.watchedEvents;
+    var listenersFor = __dependency11__.listenersFor;
+    var listenersDiff = __dependency11__.listenersDiff;
+    var listenersUnion = __dependency11__.listenersUnion;
 
-    var propertyWillChange = __dependency14__.propertyWillChange;
-    var propertyDidChange = __dependency14__.propertyDidChange;
-    var overrideChains = __dependency14__.overrideChains;
-    var beginPropertyChanges = __dependency14__.beginPropertyChanges;
-    var endPropertyChanges = __dependency14__.endPropertyChanges;
-    var changeProperties = __dependency14__.changeProperties;
+    var ObserverSet = __dependency12__["default"];
 
-    var Descriptor = __dependency15__.Descriptor;
-    var defineProperty = __dependency15__.defineProperty;
-    var set = __dependency16__.set;
-    var trySet = __dependency16__.trySet;
+    var propertyWillChange = __dependency13__.propertyWillChange;
+    var propertyDidChange = __dependency13__.propertyDidChange;
+    var overrideChains = __dependency13__.overrideChains;
+    var beginPropertyChanges = __dependency13__.beginPropertyChanges;
+    var endPropertyChanges = __dependency13__.endPropertyChanges;
+    var changeProperties = __dependency13__.changeProperties;
 
-    var OrderedSet = __dependency17__.OrderedSet;
-    var Map = __dependency17__.Map;
-    var MapWithDefault = __dependency17__.MapWithDefault;
-    var getProperties = __dependency18__["default"];
-    var setProperties = __dependency19__["default"];
-    var watchKey = __dependency20__.watchKey;
-    var unwatchKey = __dependency20__.unwatchKey;
-    var flushPendingChains = __dependency21__.flushPendingChains;
-    var removeChainWatcher = __dependency21__.removeChainWatcher;
-    var ChainNode = __dependency21__.ChainNode;
-    var finishChains = __dependency21__.finishChains;
-    var watchPath = __dependency22__.watchPath;
-    var unwatchPath = __dependency22__.unwatchPath;
-    var watch = __dependency23__.watch;
-    var isWatching = __dependency23__.isWatching;
-    var unwatch = __dependency23__.unwatch;
-    var rewatch = __dependency23__.rewatch;
-    var destroy = __dependency23__.destroy;
-    var expandProperties = __dependency24__["default"];
-    var ComputedProperty = __dependency25__.ComputedProperty;
-    var computed = __dependency25__.computed;
-    var cacheFor = __dependency25__.cacheFor;
+    var Descriptor = __dependency14__.Descriptor;
+    var defineProperty = __dependency14__.defineProperty;
+    var set = __dependency15__.set;
+    var trySet = __dependency15__.trySet;
+
+    var OrderedSet = __dependency16__.OrderedSet;
+    var Map = __dependency16__.Map;
+    var MapWithDefault = __dependency16__.MapWithDefault;
+    var getProperties = __dependency17__["default"];
+    var setProperties = __dependency18__["default"];
+    var watchKey = __dependency19__.watchKey;
+    var unwatchKey = __dependency19__.unwatchKey;
+    var flushPendingChains = __dependency20__.flushPendingChains;
+    var removeChainWatcher = __dependency20__.removeChainWatcher;
+    var ChainNode = __dependency20__.ChainNode;
+    var finishChains = __dependency20__.finishChains;
+    var watchPath = __dependency21__.watchPath;
+    var unwatchPath = __dependency21__.unwatchPath;
+    var watch = __dependency22__.watch;
+    var isWatching = __dependency22__.isWatching;
+    var unwatch = __dependency22__.unwatch;
+    var rewatch = __dependency22__.rewatch;
+    var destroy = __dependency22__.destroy;
+    var expandProperties = __dependency23__["default"];
+    var ComputedProperty = __dependency24__.ComputedProperty;
+    var computed = __dependency24__.computed;
+    var cacheFor = __dependency24__.cacheFor;
 
     // side effect of defining the computed.* macros
 
-    var addObserver = __dependency27__.addObserver;
-    var observersFor = __dependency27__.observersFor;
-    var removeObserver = __dependency27__.removeObserver;
-    var addBeforeObserver = __dependency27__.addBeforeObserver;
-    var _suspendBeforeObserver = __dependency27__._suspendBeforeObserver;
-    var _suspendObserver = __dependency27__._suspendObserver;
-    var _suspendBeforeObservers = __dependency27__._suspendBeforeObservers;
-    var _suspendObservers = __dependency27__._suspendObservers;
-    var beforeObserversFor = __dependency27__.beforeObserversFor;
-    var removeBeforeObserver = __dependency27__.removeBeforeObserver;
-    var IS_BINDING = __dependency28__.IS_BINDING;
-    var mixin = __dependency28__.mixin;
-    var Mixin = __dependency28__.Mixin;
-    var required = __dependency28__.required;
-    var aliasMethod = __dependency28__.aliasMethod;
-    var observer = __dependency28__.observer;
-    var immediateObserver = __dependency28__.immediateObserver;
-    var beforeObserver = __dependency28__.beforeObserver;
-    var Binding = __dependency29__.Binding;
-    var isGlobalPath = __dependency29__.isGlobalPath;
-    var bind = __dependency29__.bind;
-    var oneWay = __dependency29__.oneWay;
-    var run = __dependency30__["default"];
-    var libraries = __dependency31__["default"];
-    var isNone = __dependency32__.isNone;
-    var none = __dependency32__.none;
-    var isEmpty = __dependency33__.isEmpty;
-    var empty = __dependency33__.empty;
-    var isBlank = __dependency34__["default"];
-    var isPresent = __dependency35__["default"];
-    var keys = __dependency36__["default"];
-
+    var addObserver = __dependency26__.addObserver;
+    var observersFor = __dependency26__.observersFor;
+    var removeObserver = __dependency26__.removeObserver;
+    var addBeforeObserver = __dependency26__.addBeforeObserver;
+    var _suspendBeforeObserver = __dependency26__._suspendBeforeObserver;
+    var _suspendObserver = __dependency26__._suspendObserver;
+    var _suspendBeforeObservers = __dependency26__._suspendBeforeObservers;
+    var _suspendObservers = __dependency26__._suspendObservers;
+    var beforeObserversFor = __dependency26__.beforeObserversFor;
+    var removeBeforeObserver = __dependency26__.removeBeforeObserver;
+    var IS_BINDING = __dependency27__.IS_BINDING;
+    var mixin = __dependency27__.mixin;
+    var Mixin = __dependency27__.Mixin;
+    var required = __dependency27__.required;
+    var aliasMethod = __dependency27__.aliasMethod;
+    var observer = __dependency27__.observer;
+    var immediateObserver = __dependency27__.immediateObserver;
+    var beforeObserver = __dependency27__.beforeObserver;
+    var Binding = __dependency28__.Binding;
+    var isGlobalPath = __dependency28__.isGlobalPath;
+    var bind = __dependency28__.bind;
+    var oneWay = __dependency28__.oneWay;
+    var run = __dependency29__["default"];
+    var libraries = __dependency30__["default"];
+    var isNone = __dependency31__.isNone;
+    var none = __dependency31__.none;
+    var isEmpty = __dependency32__.isEmpty;
+    var empty = __dependency32__.empty;
+    var isBlank = __dependency33__["default"];
     // END IMPORTS
 
     // BEGIN EXPORTS
@@ -11000,16 +10530,11 @@ enifed("ember-metal",
     Ember.instrument = instrument;
     Ember.subscribe = subscribe;
 
-    Ember._Cache = Cache;
-
     Ember.generateGuid    = generateGuid;
     Ember.GUID_KEY        = GUID_KEY;
+    Ember.GUID_PREFIX     = GUID_PREFIX;
     Ember.create          = create;
-    Ember.keys            = keys;
-    Ember.platform        = {
-      defineProperty: defineProperty,
-      hasPropertyAccessors: hasPropertyAccessors
-    };
+    Ember.platform        = platform;
 
     var EmberArrayPolyfills = Ember.ArrayPolyfills = {};
 
@@ -11143,10 +10668,6 @@ enifed("ember-metal",
 
     Ember.isBlank = isBlank;
 
-    
-      Ember.isPresent = isPresent;
-    
-
     Ember.merge = merge;
 
     /**
@@ -11180,7 +10701,7 @@ enifed("ember-metal",
 
     __exports__["default"] = Ember;
   });
-enifed("ember-metal/alias",
+define("ember-metal/alias",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/error","ember-metal/properties","ember-metal/computed","ember-metal/platform","ember-metal/utils","ember-metal/dependent_keys","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -11260,7 +10781,7 @@ enifed("ember-metal/alias",
     AliasedProperty.prototype._meta = undefined;
     AliasedProperty.prototype.meta = ComputedProperty.prototype.meta;
   });
-enifed("ember-metal/array",
+define("ember-metal/array",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -11277,26 +10798,22 @@ enifed("ember-metal/array",
       return func && Function.prototype.toString.call(func).indexOf('[native code]') > -1;
     };
 
-    var defineNativeShim = function(nativeFunc, shim) {
-      if (isNativeFunc(nativeFunc)) {
-        return nativeFunc;
-      }
-      return shim;
-    };
-
     // From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/map
-    var map = defineNativeShim(ArrayPrototype.map, function(fun /*, thisp */) {
+    var map = isNativeFunc(ArrayPrototype.map) ? ArrayPrototype.map : function(fun /*, thisp */) {
       //"use strict";
 
-      if (this === void 0 || this === null || typeof fun !== "function") {
+      if (this === void 0 || this === null) {
         throw new TypeError();
       }
 
       var t = Object(this);
       var len = t.length >>> 0;
+      if (typeof fun !== "function") {
+        throw new TypeError();
+      }
+
       var res = new Array(len);
       var thisp = arguments[1];
-
       for (var i = 0; i < len; i++) {
         if (i in t) {
           res[i] = fun.call(thisp, t[i], i, t);
@@ -11304,61 +10821,44 @@ enifed("ember-metal/array",
       }
 
       return res;
-    });
+    };
 
     // From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/foreach
-    var forEach = defineNativeShim(ArrayPrototype.forEach, function(fun /*, thisp */) {
+    var forEach = isNativeFunc(ArrayPrototype.forEach) ? ArrayPrototype.forEach : function(fun /*, thisp */) {
       //"use strict";
 
-      if (this === void 0 || this === null || typeof fun !== "function") {
+      if (this === void 0 || this === null) {
         throw new TypeError();
       }
 
       var t = Object(this);
       var len = t.length >>> 0;
-      var thisp = arguments[1];
+      if (typeof fun !== "function") {
+        throw new TypeError();
+      }
 
+      var thisp = arguments[1];
       for (var i = 0; i < len; i++) {
         if (i in t) {
           fun.call(thisp, t[i], i, t);
         }
       }
-    });
-
-    var indexOf = defineNativeShim(ArrayPrototype.indexOf, function (obj, fromIndex) {
-      if (fromIndex === null || fromIndex === undefined) {
-        fromIndex = 0;
-      }
-      else if (fromIndex < 0) {
-        fromIndex = Math.max(0, this.length + fromIndex);
-      }
+    };
 
+    var indexOf = isNativeFunc(ArrayPrototype.indexOf) ? ArrayPrototype.indexOf : function (obj, fromIndex) {
+      if (fromIndex === null || fromIndex === undefined) { fromIndex = 0; }
+      else if (fromIndex < 0) { fromIndex = Math.max(0, this.length + fromIndex); }
       for (var i = fromIndex, j = this.length; i < j; i++) {
-        if (this[i] === obj) {
-          return i;
-        }
+        if (this[i] === obj) { return i; }
       }
       return -1;
-    });
+    };
 
-    var lastIndexOf = defineNativeShim(ArrayPrototype.lastIndexOf, function(obj, fromIndex) {
-        var len = this.length;
-        var idx;
-
-        if (fromIndex === undefined) fromIndex = len-1;
-        else fromIndex = (fromIndex < 0) ? Math.ceil(fromIndex) : Math.floor(fromIndex);
-        if (fromIndex < 0) fromIndex += len;
-
-        for(idx = fromIndex;idx>=0;idx--) {
-          if (this[idx] === obj) return idx ;
-        }
-        return -1;
-    });
-
-    var filter = defineNativeShim(ArrayPrototype.filter, function (fn, context) {
-      var i, value;
-      var result = [];
-      var length = this.length;
+    var filter = isNativeFunc(ArrayPrototype.filter) ? ArrayPrototype.filter : function (fn, context) {
+      var i,
+      value,
+      result = [],
+      length = this.length;
 
       for (i = 0; i < length; i++) {
         if (this.hasOwnProperty(i)) {
@@ -11369,14 +10869,25 @@ enifed("ember-metal/array",
         }
       }
       return result;
-    });
+    };
+
 
     if (Ember.SHIM_ES5) {
-      ArrayPrototype.map = ArrayPrototype.map || map;
-      ArrayPrototype.forEach = ArrayPrototype.forEach || forEach;
-      ArrayPrototype.filter = ArrayPrototype.filter || filter;
-      ArrayPrototype.indexOf = ArrayPrototype.indexOf || indexOf;
-      ArrayPrototype.lastIndexOf = ArrayPrototype.lastIndexOf || lastIndexOf;
+      if (!ArrayPrototype.map) {
+        ArrayPrototype.map = map;
+      }
+
+      if (!ArrayPrototype.forEach) {
+        ArrayPrototype.forEach = forEach;
+      }
+
+      if (!ArrayPrototype.filter) {
+        ArrayPrototype.filter = filter;
+      }
+
+      if (!ArrayPrototype.indexOf) {
+        ArrayPrototype.indexOf = indexOf;
+      }
     }
 
     /**
@@ -11389,10 +10900,9 @@ enifed("ember-metal/array",
     __exports__.forEach = forEach;
     __exports__.filter = filter;
     __exports__.indexOf = indexOf;
-    __exports__.lastIndexOf = lastIndexOf;
   });
-enifed("ember-metal/binding",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/observer","ember-metal/run_loop","ember-metal/path_cache","exports"],
+define("ember-metal/binding",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/map","ember-metal/observer","ember-metal/run_loop","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -11401,12 +10911,11 @@ enifed("ember-metal/binding",
     var set = __dependency3__.set;
     var trySet = __dependency3__.trySet;
     var guidFor = __dependency4__.guidFor;
-    var addObserver = __dependency5__.addObserver;
-    var removeObserver = __dependency5__.removeObserver;
-    var _suspendObserver = __dependency5__._suspendObserver;
-    var run = __dependency6__["default"];
-    var isGlobalPath = __dependency7__.isGlobal;
-
+    var Map = __dependency5__.Map;
+    var addObserver = __dependency6__.addObserver;
+    var removeObserver = __dependency6__.removeObserver;
+    var _suspendObserver = __dependency6__._suspendObserver;
+    var run = __dependency7__["default"];
 
     // ES6TODO: where is Ember.lookup defined?
     /**
@@ -11429,6 +10938,8 @@ enifed("ember-metal/binding",
     */
     Ember.LOG_BINDINGS = false || !!Ember.ENV.LOG_BINDINGS;
 
+    var IS_GLOBAL = /^([A-Z$]|([0-9][A-Z$]))/;
+
     /**
       Returns true if the provided path is global (e.g., `MyApp.fooController.bar`)
       instead of local (`foo.bar.baz`).
@@ -11439,6 +10950,9 @@ enifed("ember-metal/binding",
       @param {String} path
       @return Boolean
     */
+    function isGlobalPath(path) {
+      return IS_GLOBAL.test(path);
+    }
 
     function getWithGlobals(obj, path) {
       return get(isGlobalPath(path) ? Ember.lookup : obj, path);
@@ -11449,9 +10963,10 @@ enifed("ember-metal/binding",
     //
 
     function Binding(toPath, fromPath) {
-      this._direction = undefined;
+      this._direction = 'fwd';
       this._from = fromPath;
       this._to   = toPath;
+      this._directionMap = Map.create();
       this._readyToSync = undefined;
       this._oneWay = undefined;
     }
@@ -11553,8 +11068,7 @@ enifed("ember-metal/binding",
       connect: function(obj) {
         Ember.assert('Must pass a valid object to Ember.Binding.connect()', !!obj);
 
-        var fromPath = this._from;
-        var toPath = this._to;
+        var fromPath = this._from, toPath = this._to;
         trySet(obj, toPath, getWithGlobals(obj, fromPath));
 
         // add an observer on the object to be notified when the binding should be updated
@@ -11607,18 +11121,19 @@ enifed("ember-metal/binding",
       },
 
       _scheduleSync: function(obj, dir) {
-        var existingDir = this._direction;
+        var directionMap = this._directionMap;
+        var existingDir = directionMap.get(obj);
 
         // if we haven't scheduled the binding yet, schedule it
-        if (existingDir === undefined) {
+        if (!existingDir) {
           run.schedule('sync', this, this._sync, obj);
-          this._direction  = dir;
+          directionMap.set(obj, dir);
         }
 
         // If both a 'back' and 'fwd' sync have been scheduled on the same object,
         // default to a 'fwd' sync so that it remains deterministic.
         if (existingDir === 'back' && dir === 'fwd') {
-          this._direction = 'fwd';
+          directionMap.set(obj, 'fwd');
         }
       },
 
@@ -11630,12 +11145,12 @@ enifed("ember-metal/binding",
 
         // get the direction of the binding for the object we are
         // synchronizing from
-        var direction = this._direction;
+        var directionMap = this._directionMap;
+        var direction = directionMap.get(obj);
 
-        var fromPath = this._from;
-        var toPath = this._to;
+        var fromPath = this._from, toPath = this._to;
 
-        this._direction = undefined;
+        directionMap.remove(obj);
 
         // if we're synchronizing from the remote object...
         if (direction === 'fwd') {
@@ -11680,9 +11195,9 @@ enifed("ember-metal/binding",
         @method from
         @static
       */
-      from: function(from) {
-        var C = this;
-        return new C(undefined, from);
+      from: function() {
+        var C = this, binding = new C();
+        return binding.from.apply(binding, arguments);
       },
 
       /*
@@ -11691,9 +11206,9 @@ enifed("ember-metal/binding",
         @method to
         @static
       */
-      to: function(to) {
-        var C = this;
-        return new C(to, undefined);
+      to: function() {
+        var C = this, binding = new C();
+        return binding.to.apply(binding, arguments);
       },
 
       /**
@@ -11713,8 +11228,8 @@ enifed("ember-metal/binding",
         @return {Ember.Binding} `this`
       */
       oneWay: function(from, flag) {
-        var C = this;
-        return new C(undefined, from).oneWay(flag);
+        var C = this, binding = new C(null, from);
+        return binding.oneWay(flag);
       }
 
     });
@@ -11884,67 +11399,7 @@ enifed("ember-metal/binding",
     __exports__.oneWay = oneWay;__exports__.Binding = Binding;
     __exports__.isGlobalPath = isGlobalPath;
   });
-enifed("ember-metal/cache",
-  ["ember-metal/dictionary","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var dictionary = __dependency1__["default"];
-    __exports__["default"] = Cache;
-
-    function Cache(limit, func) {
-      this.store  = dictionary(null);
-      this.size   = 0;
-      this.misses = 0;
-      this.hits   = 0;
-      this.limit  = limit;
-      this.func   = func;
-    }
-
-    var FALSE     = function() { };
-    var ZERO      = function() { };
-    var UNDEFINED = function() { };
-    var NULL      = function() { };
-
-    Cache.prototype = {
-      set: function(key, value) {
-        if (this.limit > this.size) {
-          this.size ++;
-          if (value === undefined) {
-            this.store[key] = UNDEFINED;
-          } else {
-            this.store[key] = value;
-          }
-        }
-
-        return value;
-      },
-
-      get: function(key) {
-        var value = this.store[key];
-
-        if (value === undefined) {
-          this.misses ++;
-          value = this.set(key, this.func(key));
-        } else if (value === UNDEFINED) {
-          this.hits ++;
-          value = undefined;
-        } else {
-          this.hits ++;
-          // nothing to translate
-        }
-
-        return value;
-      },
-
-      purge: function() {
-        this.store  = dictionary(null);
-        this.size   = 0;
-        this.hits   = 0;
-        this.misses = 0;
-      }
-    };
-  });
-enifed("ember-metal/chains",
+define("ember-metal/chains",
   ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/array","ember-metal/watch_key","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -11953,13 +11408,14 @@ enifed("ember-metal/chains",
     var get = __dependency2__.get;
     var normalizeTuple = __dependency2__.normalizeTuple;
     var meta = __dependency3__.meta;
+    var META_KEY = __dependency3__.META_KEY;
     var forEach = __dependency4__.forEach;
     var watchKey = __dependency5__.watchKey;
     var unwatchKey = __dependency5__.unwatchKey;
 
-    var metaFor = meta;
-    var warn = Ember.warn;
-    var FIRST_KEY = /^([^\.]+)/;
+    var metaFor = meta,
+        warn = Ember.warn,
+        FIRST_KEY = /^([^\.]+)/;
 
     function firstKey(path) {
       return path.match(FIRST_KEY)[0];
@@ -11984,8 +11440,7 @@ enifed("ember-metal/chains",
     __exports__.flushPendingChains = flushPendingChains;function addChainWatcher(obj, keyName, node) {
       if (!obj || ('object' !== typeof obj)) { return; } // nothing to do
 
-      var m = metaFor(obj);
-      var nodes = m.chainWatchers;
+      var m = metaFor(obj), nodes = m.chainWatchers;
 
       if (!m.hasOwnProperty('chainWatchers')) {
         nodes = m.chainWatchers = {};
@@ -11999,7 +11454,7 @@ enifed("ember-metal/chains",
     function removeChainWatcher(obj, keyName, node) {
       if (!obj || 'object' !== typeof obj) { return; } // nothing to do
 
-      var m = obj['__ember_meta__'];
+      var m = obj[META_KEY];
       if (m && !m.hasOwnProperty('chainWatchers')) { return; } // nothing to do
 
       var nodes = m && m.chainWatchers;
@@ -12053,7 +11508,7 @@ enifed("ember-metal/chains",
     function lazyGet(obj, key) {
       if (!obj) return undefined;
 
-      var meta = obj['__ember_meta__'];
+      var meta = obj[META_KEY];
       // check if object meant only to be a prototype
       if (meta && meta.proto === obj) return undefined;
 
@@ -12090,10 +11545,8 @@ enifed("ember-metal/chains",
 
     // copies a top level object only
     ChainNodePrototype.copy = function(obj) {
-      var ret = new ChainNode(null, null, obj);
-      var paths = this._paths;
-      var path;
-
+      var ret = new ChainNode(null, null, obj),
+          paths = this._paths, path;
       for (path in paths) {
         if (paths[path] <= 0) { continue; } // this check will also catch non-number vals.
         ret.add(path);
@@ -12163,8 +11616,7 @@ enifed("ember-metal/chains",
     ChainNodePrototype.count = 0;
 
     ChainNodePrototype.chain = function(key, path, src) {
-      var chains = this._chains;
-      var node;
+      var chains = this._chains, node;
       if (!chains) { chains = this._chains = {}; }
 
       node = chains[key];
@@ -12180,8 +11632,7 @@ enifed("ember-metal/chains",
     };
 
     ChainNodePrototype.unchain = function(key, path) {
-      var chains = this._chains;
-      var node = chains[key];
+      var chains = this._chains, node = chains[key];
 
       // unchain rest of path first...
       if (path && path.length>1) {
@@ -12277,26 +11728,12 @@ enifed("ember-metal/chains",
 
     function finishChains(obj) {
       // We only create meta if we really have to
-      var m = obj['__ember_meta__'],
-        chains, chainWatchers, chainNodes;
-      if (m) {
-        // finish any current chains node watchers that reference obj
-        chainWatchers = m.chainWatchers;
-        if (chainWatchers) {
-          for(var key in chainWatchers) {
-            if (!chainWatchers.hasOwnProperty(key)) { continue; }
-            chainNodes = chainWatchers[key];
-            if (chainNodes) {
-              for (var i=0,l=chainNodes.length;i<l;i++) {
-                chainNodes[i].didChange(null);
-              }
-            }
-          }
-        }
-        // copy chains from prototype
-        chains = m.chains;
-        if (chains && chains.value() !== obj) {
+      var m = obj[META_KEY], chains = m && m.chains;
+      if (chains) {
+        if (chains.value() !== obj) {
           metaFor(obj).chains = chains = chains.copy(obj);
+        } else {
+          chains.didChange(null);
         }
       }
     }
@@ -12304,7 +11741,7 @@ enifed("ember-metal/chains",
     __exports__.finishChains = finishChains;__exports__.removeChainWatcher = removeChainWatcher;
     __exports__.ChainNode = ChainNode;
   });
-enifed("ember-metal/computed",
+define("ember-metal/computed",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/expand_properties","ember-metal/error","ember-metal/properties","ember-metal/property_events","ember-metal/dependent_keys","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -12312,6 +11749,7 @@ enifed("ember-metal/computed",
     var get = __dependency2__.get;
     var set = __dependency3__.set;
     var meta = __dependency4__.meta;
+    var META_KEY = __dependency4__.META_KEY;
     var inspect = __dependency4__.inspect;
     var expandProperties = __dependency5__["default"];
     var EmberError = __dependency6__["default"];
@@ -12329,8 +11767,8 @@ enifed("ember-metal/computed",
     Ember.warn("The CP_DEFAULT_CACHEABLE flag has been removed and computed properties are always cached by default. Use `volatile` if you don't want caching.", Ember.ENV.CP_DEFAULT_CACHEABLE !== false);
 
 
-    var metaFor = meta;
-    var a_slice = [].slice;
+    var metaFor = meta,
+        a_slice = [].slice;
 
     function UNDEFINED() { }
 
@@ -12662,124 +12100,81 @@ enifed("ember-metal/computed",
       Generally speaking if you intend for your computed property to be set
       your backing function should accept either two or three arguments.
 
-      ```javascript
-      var Person = Ember.Object.extend({
-        // these will be supplied by `create`
-        firstName: null,
-        lastName: null,
-
-        fullName: function(key, value, oldValue) {
-          // getter
-          if (arguments.length === 1) {
-            var firstName = this.get('firstName');
-            var lastName = this.get('lastName');
-
-            return firstName + ' ' + lastName;
-
-          // setter
-          } else {
-            var name = value.split(' ');
-
-            this.set('firstName', name[0]);
-            this.set('lastName', name[1]);
-
-            return value;
-          }
-        }.property('firstName', 'lastName')
-      });
-
-      var person = Person.create();
-
-      person.set('fullName', 'Peter Wagenet');
-      person.get('firstName'); // 'Peter'
-      person.get('lastName');  // 'Wagenet'
-      ```
-
       @method set
       @param {String} keyName The key being accessed.
       @param {Object} newValue The new value being assigned.
       @param {String} oldValue The old value being replaced.
       @return {Object} The return value of the function backing the CP.
     */
-    ComputedPropertyPrototype.set = function computedPropertySetWithSuspend(obj, keyName, value) {
-      var oldSuspended = this._suspended;
-
-      this._suspended = obj;
-
-      try {
-        this._set(obj, keyName, value);
-      } finally {
-        this._suspended = oldSuspended;
-      }
-    };
-
-    ComputedPropertyPrototype._set = function computedPropertySet(obj, keyName, value) {
-      var cacheable      = this._cacheable;
-      var func           = this.func;
-      var meta           = metaFor(obj, cacheable);
-      var cache          = meta.cache;
-      var hadCachedValue = false;
-
-      var funcArgLength, cachedValue, ret;
+    ComputedPropertyPrototype.set = function(obj, keyName, value) {
+      var cacheable = this._cacheable,
+          func = this.func,
+          meta = metaFor(obj, cacheable),
+          oldSuspended = this._suspended,
+          hadCachedValue = false,
+          cache = meta.cache,
+          funcArgLength, cachedValue, ret;
 
       if (this._readOnly) {
         throw new EmberError('Cannot set read-only property "' + keyName + '" on object: ' + inspect(obj));
       }
 
-      if (cacheable && cache[keyName] !== undefined) {
-        if(cache[keyName] !== UNDEFINED) {
-          cachedValue = cache[keyName];
+      this._suspended = obj;
+
+      try {
+
+        if (cacheable && cache[keyName] !== undefined) {
+          if(cache[keyName] !== UNDEFINED) {
+            cachedValue = cache[keyName];
+          }
+
+          hadCachedValue = true;
         }
 
-        hadCachedValue = true;
-      }
+        // Check if the CP has been wrapped. If it has, use the
+        // length from the wrapped function.
 
-      // Check if the CP has been wrapped. If it has, use the
-      // length from the wrapped function.
+        funcArgLength = func.wrappedFunction ? func.wrappedFunction.__ember_arity__ : func.__ember_arity__;
 
-      funcArgLength = func.wrappedFunction ? func.wrappedFunction.__ember_arity__ : func.__ember_arity__;
-
-      // For backwards-compatibility with computed properties
-      // that check for arguments.length === 2 to determine if
-      // they are being get or set, only pass the old cached
-      // value if the computed property opts into a third
-      // argument.
-      if (funcArgLength === 3) {
-        ret = func.call(obj, keyName, value, cachedValue);
-      } else if (funcArgLength === 2) {
-        ret = func.call(obj, keyName, value);
-      } else {
-        defineProperty(obj, keyName, null, cachedValue);
-        set(obj, keyName, value);
-        return;
-      }
-
-      if (hadCachedValue && cachedValue === ret) { return; }
-
-      var watched = meta.watching[keyName];
-      if (watched) {
-        propertyWillChange(obj, keyName);
-      }
-
-      if (hadCachedValue) {
-        cache[keyName] = undefined;
-      }
-
-      if (cacheable) {
-        if (!hadCachedValue) {
-          addDependentKeys(this, obj, keyName, meta);
-        }
-        if (ret === undefined) {
-          cache[keyName] = UNDEFINED;
+        // For backwards-compatibility with computed properties
+        // that check for arguments.length === 2 to determine if
+        // they are being get or set, only pass the old cached
+        // value if the computed property opts into a third
+        // argument.
+        if (funcArgLength === 3) {
+          ret = func.call(obj, keyName, value, cachedValue);
+        } else if (funcArgLength === 2) {
+          ret = func.call(obj, keyName, value);
         } else {
-          cache[keyName] = ret;
+          defineProperty(obj, keyName, null, cachedValue);
+          set(obj, keyName, value);
+          return;
         }
-      }
 
-      if (watched) {
-        propertyDidChange(obj, keyName);
-      }
+        if (hadCachedValue && cachedValue === ret) { return; }
 
+        var watched = meta.watching[keyName];
+        if (watched) { propertyWillChange(obj, keyName); }
+
+        if (hadCachedValue) {
+          cache[keyName] = undefined;
+        }
+
+        if (cacheable) {
+          if (!hadCachedValue) {
+            addDependentKeys(this, obj, keyName, meta);
+          }
+          if (ret === undefined) {
+            cache[keyName] = UNDEFINED;
+          } else {
+            cache[keyName] = ret;
+          }
+        }
+
+        if (watched) { propertyDidChange(obj, keyName); }
+      } finally {
+        this._suspended = oldSuspended;
+      }
       return ret;
     };
 
@@ -12806,45 +12201,9 @@ enifed("ember-metal/computed",
       The function should accept two parameters, key and value. If value is not
       undefined you should set the value first. In either case return the
       current value of the property.
-      
-      A computed property defined in this way might look like this:
-
-      ```js
-      var Person = Ember.Object.extend({
-        firstName: 'Betty',
-        lastName: 'Jones',
-
-        fullName: Ember.computed('firstName', 'lastName', function(key, value) {
-          return this.get('firstName') + ' ' + this.get('lastName');
-        })
-      });
-
-      var client = Person.create();
-
-      client.get('fullName'); // 'Betty Jones'
-      
-      client.set('lastName', 'Fuller');
-      client.get('fullName'); // 'Betty Fuller'
-      ```
-
-      _Note: This is the prefered way to define computed properties when writing third-party
-      libraries that depend on or use Ember, since there is no guarantee that the user
-      will have prototype extensions enabled._
-
-      You might use this method if you disabled
-      [Prototype Extensions](http://emberjs.com/guides/configuring-ember/disabling-prototype-extensions/).
-      The alternative syntax might look like this
-      (if prototype extensions are enabled, which is the default behavior):
-
-      ```js
-      fullName: function () {
-        return this.get('firstName') + ' ' + this.get('lastName');
-      }.property('firstName', 'lastName')
-      ```
 
       @method computed
       @for Ember
-      @param {String} [dependentKeys*] Optional dependent keys that trigger this computed property.
       @param {Function} func The computed property function.
       @return {Ember.ComputedProperty} property descriptor instance
     */
@@ -12883,9 +12242,9 @@ enifed("ember-metal/computed",
       @return {Object} the cached value
     */
     function cacheFor(obj, key) {
-      var meta = obj['__ember_meta__'];
-      var cache = meta && meta.cache;
-      var ret = cache && cache[key];
+      var meta = obj[META_KEY],
+          cache = meta && meta.cache,
+          ret = cache && cache[key];
 
       if (ret === UNDEFINED) { return undefined; }
       return ret;
@@ -12913,7 +12272,7 @@ enifed("ember-metal/computed",
     __exports__.computed = computed;
     __exports__.cacheFor = cacheFor;
   });
-enifed("ember-metal/computed_macros",
+define("ember-metal/computed_macros",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/is_empty","ember-metal/is_none","ember-metal/alias"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
     "use strict";
@@ -13177,7 +12536,7 @@ enifed("ember-metal/computed_macros",
     });
 
     /**
-      A computed property that returns true if the provided dependent property
+      A computed property that returns true if the provied dependent property
       is greater than the provided value.
 
       Example
@@ -13201,7 +12560,7 @@ enifed("ember-metal/computed_macros",
       @param {String} dependentKey
       @param {Number} value
       @return {Ember.ComputedProperty} computed property which returns true if
-      the original value for property is greater than given value.
+      the original value for property is greater then given value.
     */
     registerComputed('gt', function(dependentKey, value) {
       return get(this, dependentKey) > value;
@@ -13294,7 +12653,7 @@ enifed("ember-metal/computed_macros",
       @param {String} dependentKey
       @param {Number} value
       @return {Ember.ComputedProperty} computed property which returns true if
-      the original value for property is less or equal than given value.
+      the original value for property is less or equal then given value.
     */
     registerComputed('lte', function(dependentKey, value) {
       return get(this, dependentKey) <= value;
@@ -13424,7 +12783,7 @@ enifed("ember-metal/computed_macros",
       @for Ember
       @param {String} dependentKey*
       @return {Ember.ComputedProperty} computed property which maps
-      values of all passed in properties to an array.
+      values of all passed properties in to an array.
     */
     registerComputedWithProperties('collect', function(properties) {
       var res = [];
@@ -13504,17 +12863,19 @@ enifed("ember-metal/computed_macros",
       return alias(dependentKey).oneWay();
     };
 
-    /**
-      This is a more semantically meaningful alias of `computed.oneWay`,
-      whose name is somewhat ambiguous as to which direction the data flows.
+    
+      /**
+        This is a more semantically meaningful alias of `computed.oneWay`,
+        whose name is somewhat ambiguous as to which direction the data flows.
 
-      @method computed.reads
-      @for Ember
-      @param {String} dependentKey
-      @return {Ember.ComputedProperty} computed property which creates a
-        one way computed property to the original value for property.
-     */
-    computed.reads = computed.oneWay;
+        @method computed.reads
+        @for Ember
+        @param {String} dependentKey
+        @return {Ember.ComputedProperty} computed property which creates a
+          one way computed property to the original value for property.
+       */
+      computed.reads = computed.oneWay;
+    
 
     /**
       Where `computed.oneWay` provides oneWay bindings, `computed.readOnly` provides
@@ -13578,13 +12939,10 @@ enifed("ember-metal/computed_macros",
       @param {String} defaultPath
       @return {Ember.ComputedProperty} computed property which acts like
       a standard getter and setter, but defaults to the value from `defaultPath`.
-      @deprecated Use `Ember.computed.oneWay` or custom CP with default instead.
     */
     // ES6TODO: computed should have its own export path so you can do import {defaultTo} from computed
     computed.defaultTo = function(defaultPath) {
       return computed(function(key, newValue, cachedValue) {
-        Ember.deprecate('Usage of Ember.computed.defaultTo is deprecated, use `Ember.computed.oneWay` instead.');
-
         if (arguments.length === 1) {
           return get(this, defaultPath);
         }
@@ -13618,7 +12976,7 @@ enifed("ember-metal/computed_macros",
       });
     };
   });
-enifed("ember-metal/core",
+define("ember-metal/core",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -13646,7 +13004,7 @@ enifed("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.8.1
+      @version 1.7.1
     */
 
     if ('undefined' === typeof Ember) {
@@ -13673,10 +13031,10 @@ enifed("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.8.1'
+      @default '1.7.1'
       @static
     */
-    Ember.VERSION = '1.8.1';
+    Ember.VERSION = '1.7.1';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -13833,15 +13191,15 @@ enifed("ember-metal/core",
 
     __exports__["default"] = Ember;
   });
-enifed("ember-metal/dependent_keys",
+define("ember-metal/dependent_keys",
   ["ember-metal/platform","ember-metal/watching","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
-        // Remove "use strict"; from transpiled module until
+        // Remove "use strict"; from transpiled module (in browser builds only) until
     // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
     //
     // REMOVE_USE_STRICT: true
 
-    var o_create = __dependency1__.create;
+    var create = __dependency1__.create;
     var watch = __dependency2__.watch;
     var unwatch = __dependency2__.unwatch;
 
@@ -13849,6 +13207,8 @@ enifed("ember-metal/dependent_keys",
     @module ember-metal
     */
 
+    var o_create = create;
+
     // ..........................................................
     // DEPENDENT KEYS
     //
@@ -13922,69 +13282,7 @@ enifed("ember-metal/dependent_keys",
 
     __exports__.removeDependentKeys = removeDependentKeys;
   });
-enifed("ember-metal/deprecate_property",
-  ["ember-metal/core","ember-metal/platform","ember-metal/properties","ember-metal/property_get","ember-metal/property_set","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
-    "use strict";
-    /**
-    @module ember-metal
-    */
-
-    var Ember = __dependency1__["default"];
-    var hasPropertyAccessors = __dependency2__.hasPropertyAccessors;
-    var defineProperty = __dependency3__.defineProperty;
-    var get = __dependency4__.get;
-    var set = __dependency5__.set;
-
-
-    /**
-      Used internally to allow changing properties in a backwards compatible way, and print a helpful
-      deprecation warning.
-
-      @method deprecateProperty
-      @param {Object} object The object to add the deprecated property to.
-      @param {String} deprecatedKey The property to add (and print deprecation warnings upon accessing).
-      @param {String} newKey The property that will be aliased.
-      @private
-      @since 1.7.0
-    */
-
-    function deprecateProperty(object, deprecatedKey, newKey) {
-      function deprecate() {
-        Ember.deprecate('Usage of `' + deprecatedKey + '` is deprecated, use `' + newKey + '` instead.');
-      }
-
-      if (hasPropertyAccessors) {
-        defineProperty(object, deprecatedKey, {
-            configurable: true,
-            enumerable: false,
-            set: function(value) { deprecate(); set(this, newKey, value); },
-            get: function() { deprecate(); return get(this, newKey); }
-        });
-      }
-    }
-
-    __exports__.deprecateProperty = deprecateProperty;
-  });
-enifed("ember-metal/dictionary",
-  ["ember-metal/platform","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var create = __dependency1__.create;
-
-    // the delete is meant to hint at runtimes that this object should remain in
-    // dictionary mode. This is clearly a runtime specific hack, but currently it
-    // appears worthwile in some usecases. Please note, these deletes do increase
-    // the cost of creation dramatically over a plain Object.create. And as this
-    // only makes sense for long-lived dictionaries that aren't instantiated often.
-    __exports__["default"] = function makeDictionary(parent) {
-      var dict = create(parent);
-      dict['_dict'] = null;
-      delete dict['_dict'];
-      return dict;
-    }
-  });
-enifed("ember-metal/enumerable_utils",
+define("ember-metal/enumerable_utils",
   ["ember-metal/array","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -14016,7 +13314,7 @@ enifed("ember-metal/enumerable_utils",
      * @return {Array} An array of mapped values.
      */
     function map(obj, callback, thisArg) {
-      return obj.map ? obj.map(callback, thisArg) : _map.call(obj, callback, thisArg);
+      return obj.map ? obj.map.call(obj, callback, thisArg) : _map.call(obj, callback, thisArg);
     }
 
     __exports__.map = map;/**
@@ -14030,7 +13328,7 @@ enifed("ember-metal/enumerable_utils",
      *
      */
     function forEach(obj, callback, thisArg) {
-      return obj.forEach ? obj.forEach(callback, thisArg) : a_forEach.call(obj, callback, thisArg);
+      return obj.forEach ? obj.forEach.call(obj, callback, thisArg) : a_forEach.call(obj, callback, thisArg);
     }
 
     __exports__.forEach = forEach;/**
@@ -14046,7 +13344,7 @@ enifed("ember-metal/enumerable_utils",
      * @since 1.4.0
      */
     function filter(obj, callback, thisArg) {
-      return obj.filter ? obj.filter(callback, thisArg) : _filter.call(obj, callback, thisArg);
+      return obj.filter ? obj.filter.call(obj, callback, thisArg) : _filter.call(obj, callback, thisArg);
     }
 
     __exports__.filter = filter;/**
@@ -14060,7 +13358,7 @@ enifed("ember-metal/enumerable_utils",
      *
      */
     function indexOf(obj, element, index) {
-      return obj.indexOf ? obj.indexOf(element, index) : _indexOf.call(obj, element, index);
+      return obj.indexOf ? obj.indexOf.call(obj, element, index) : _indexOf.call(obj, element, index);
     }
 
     __exports__.indexOf = indexOf;/**
@@ -14119,13 +13417,9 @@ enifed("ember-metal/enumerable_utils",
     }
 
     __exports__.removeObject = removeObject;function _replace(array, idx, amt, objects) {
-      var args = [].concat(objects);
-      var ret = [];
-      // https://code.google.com/p/chromium/issues/detail?id=56588
-      var size = 60000;
-      var start = idx;
-      var ends = amt;
-      var count, chunk;
+      var args = [].concat(objects), chunk, ret = [],
+          // https://code.google.com/p/chromium/issues/detail?id=56588
+          size = 60000, start = idx, ends = amt, count;
 
       while (args.length) {
         count = ends > size ? size : ends;
@@ -14224,7 +13518,7 @@ enifed("ember-metal/enumerable_utils",
       replace: replace
     };
   });
-enifed("ember-metal/error",
+define("ember-metal/error",
   ["ember-metal/platform","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -14271,7 +13565,7 @@ enifed("ember-metal/error",
 
     __exports__["default"] = EmberError;
   });
-enifed("ember-metal/events",
+define("ember-metal/events",
   ["ember-metal/core","ember-metal/utils","ember-metal/platform","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
         // Remove "use strict"; from transpiled module until
@@ -14284,17 +13578,16 @@ enifed("ember-metal/events",
     */
     var Ember = __dependency1__["default"];
     var meta = __dependency2__.meta;
+    var META_KEY = __dependency2__.META_KEY;
     var tryFinally = __dependency2__.tryFinally;
     var apply = __dependency2__.apply;
     var applyStr = __dependency2__.applyStr;
     var create = __dependency3__.create;
 
-    var a_slice = [].slice;
-    var metaFor = meta;
-
-    /* listener flags */
-    var ONCE = 1;
-    var SUSPENDED = 2;
+    var a_slice = [].slice,
+        metaFor = meta,
+        /* listener flags */
+        ONCE = 1, SUSPENDED = 2;
 
 
     /*
@@ -14329,8 +13622,8 @@ enifed("ember-metal/events",
     }
 
     function actionsFor(obj, eventName) {
-      var meta = metaFor(obj, true);
-      var actions;
+      var meta = metaFor(obj, true),
+          actions;
 
       if (!meta.listeners) { meta.listeners = {}; }
 
@@ -14352,15 +13645,15 @@ enifed("ember-metal/events",
     }
 
     function listenersUnion(obj, eventName, otherActions) {
-      var meta = obj['__ember_meta__'];
-      var actions = meta && meta.listeners && meta.listeners[eventName];
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName];
 
       if (!actions) { return; }
       for (var i = actions.length - 3; i >= 0; i -= 3) {
-        var target = actions[i];
-        var method = actions[i+1];
-        var flags = actions[i+2];
-        var actionIndex = indexOf(otherActions, target, method);
+        var target = actions[i],
+            method = actions[i+1],
+            flags = actions[i+2],
+            actionIndex = indexOf(otherActions, target, method);
 
         if (actionIndex === -1) {
           otherActions.push(target, method, flags);
@@ -14369,16 +13662,16 @@ enifed("ember-metal/events",
     }
 
     __exports__.listenersUnion = listenersUnion;function listenersDiff(obj, eventName, otherActions) {
-      var meta = obj['__ember_meta__'];
-      var actions = meta && meta.listeners && meta.listeners[eventName];
-      var diffActions = [];
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName],
+          diffActions = [];
 
       if (!actions) { return; }
       for (var i = actions.length - 3; i >= 0; i -= 3) {
-        var target = actions[i];
-        var method = actions[i+1];
-        var flags = actions[i+2];
-        var actionIndex = indexOf(otherActions, target, method);
+        var target = actions[i],
+            method = actions[i+1],
+            flags = actions[i+2],
+            actionIndex = indexOf(otherActions, target, method);
 
         if (actionIndex !== -1) { continue; }
 
@@ -14408,9 +13701,9 @@ enifed("ember-metal/events",
         target = null;
       }
 
-      var actions = actionsFor(obj, eventName);
-      var actionIndex = indexOf(actions, target, method);
-      var flags = 0;
+      var actions = actionsFor(obj, eventName),
+          actionIndex = indexOf(actions, target, method),
+          flags = 0;
 
       if (once) flags |= ONCE;
 
@@ -14444,8 +13737,8 @@ enifed("ember-metal/events",
       }
 
       function _removeListener(target, method) {
-        var actions = actionsFor(obj, eventName);
-        var actionIndex = indexOf(actions, target, method);
+        var actions = actionsFor(obj, eventName),
+            actionIndex = indexOf(actions, target, method);
 
         // action doesn't exist, give up silently
         if (actionIndex === -1) { return; }
@@ -14460,8 +13753,8 @@ enifed("ember-metal/events",
       if (method) {
         _removeListener(target, method);
       } else {
-        var meta = obj['__ember_meta__'];
-        var actions = meta && meta.listeners && meta.listeners[eventName];
+        var meta = obj[META_KEY],
+            actions = meta && meta.listeners && meta.listeners[eventName];
 
         if (!actions) { return; }
         for (var i = actions.length - 3; i >= 0; i -= 3) {
@@ -14494,8 +13787,8 @@ enifed("ember-metal/events",
         target = null;
       }
 
-      var actions = actionsFor(obj, eventName);
-      var actionIndex = indexOf(actions, target, method);
+      var actions = actionsFor(obj, eventName),
+          actionIndex = indexOf(actions, target, method);
 
       if (actionIndex !== -1) {
         actions[actionIndex+2] |= SUSPENDED; // mark the action as suspended
@@ -14526,9 +13819,9 @@ enifed("ember-metal/events",
         target = null;
       }
 
-      var suspendedActions = [];
-      var actionsList = [];
-      var eventName, actions, i, l;
+      var suspendedActions = [],
+          actionsList = [],
+          eventName, actions, i, l;
 
       for (i=0, l=eventNames.length; i<l; i++) {
         eventName = eventNames[i];
@@ -14563,7 +13856,7 @@ enifed("ember-metal/events",
       @param obj
     */
     function watchedEvents(obj) {
-      var listeners = obj['__ember_meta__'].listeners, ret = [];
+      var listeners = obj[META_KEY].listeners, ret = [];
 
       if (listeners) {
         for(var eventName in listeners) {
@@ -14594,7 +13887,7 @@ enifed("ember-metal/events",
       }
 
       if (!actions) {
-        var meta = obj['__ember_meta__'];
+        var meta = obj[META_KEY];
         actions = meta && meta.listeners && meta.listeners[eventName];
       }
 
@@ -14631,8 +13924,8 @@ enifed("ember-metal/events",
       @param {String} eventName
     */
     function hasListeners(obj, eventName) {
-      var meta = obj['__ember_meta__'];
-      var actions = meta && meta.listeners && meta.listeners[eventName];
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName];
 
       return !!(actions && actions.length);
     }
@@ -14646,14 +13939,14 @@ enifed("ember-metal/events",
     */
     function listenersFor(obj, eventName) {
       var ret = [];
-      var meta = obj['__ember_meta__'];
-      var actions = meta && meta.listeners && meta.listeners[eventName];
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName];
 
       if (!actions) { return ret; }
 
       for (var i = 0, l = actions.length; i < l; i += 3) {
-        var target = actions[i];
-        var method = actions[i+1];
+        var target = actions[i],
+            method = actions[i+1];
         ret.push([target, method]);
       }
 
@@ -14684,68 +13977,58 @@ enifed("ember-metal/events",
       @return func
     */
     function on(){
-      var func = a_slice.call(arguments, -1)[0];
-      var events = a_slice.call(arguments, 0, -1);
+      var func = a_slice.call(arguments, -1)[0],
+          events = a_slice.call(arguments, 0, -1);
       func.__ember_listens__ = events;
       return func;
     }
 
     __exports__.on = on;__exports__.removeListener = removeListener;
   });
-enifed("ember-metal/expand_properties",
-  ["ember-metal/core","ember-metal/error","ember-metal/enumerable_utils","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+define("ember-metal/expand_properties",
+  ["ember-metal/error","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    var EmberError = __dependency2__["default"];
-    var forEach = __dependency3__.forEach;
+    var EmberError = __dependency1__["default"];
+    var forEach = __dependency2__.forEach;
 
     /**
       @module ember-metal
       */
 
     var BRACE_EXPANSION = /^((?:[^\.]*\.)*)\{(.*)\}$/;
-    var SPLIT_REGEX = /\{|\}/;
 
     /**
       Expands `pattern`, invoking `callback` for each expansion.
 
       The only pattern supported is brace-expansion, anything else will be passed
-      once to `callback` directly.
+      once to `callback` directly. Brace expansion can only appear at the end of a
+      pattern, for an example see the last call below.
 
       Example
-
       ```js
       function echo(arg){ console.log(arg); }
 
-      Ember.expandProperties('foo.bar', echo);              //=> 'foo.bar'
-      Ember.expandProperties('{foo,bar}', echo);            //=> 'foo', 'bar'
-      Ember.expandProperties('foo.{bar,baz}', echo);        //=> 'foo.bar', 'foo.baz'
-      Ember.expandProperties('{foo,bar}.baz', echo);        //=> '{foo,bar}.baz'
-      Ember.expandProperties('foo.{bar,baz}.@each', echo)   //=> 'foo.bar.@each', 'foo.baz.@each'
-      Ember.expandProperties('{foo,bar}.{spam,eggs}', echo) //=> 'foo.spam', 'foo.eggs', 'bar.spam', 'bar.eggs'
-      Ember.expandProperties('{foo}.bar.{baz}')             //=> 'foo.bar.baz'
+      Ember.expandProperties('foo.bar', echo);        //=> 'foo.bar'
+      Ember.expandProperties('{foo,bar}', echo);      //=> 'foo', 'bar'
+      Ember.expandProperties('foo.{bar,baz}', echo);  //=> 'foo.bar', 'foo.baz'
+      Ember.expandProperties('{foo,bar}.baz', echo);  //=> '{foo,bar}.baz'
       ```
 
       @method
       @private
-      @param {String} pattern The property pattern to expand.
-      @param {Function} callback The callback to invoke.  It is invoked once per
+      @param {string} pattern The property pattern to expand.
+      @param {function} callback The callback to invoke.  It is invoked once per
       expansion, and is passed the expansion.
       */
     __exports__["default"] = function expandProperties(pattern, callback) {
+      var match, prefix, list;
+
       if (pattern.indexOf(' ') > -1) {
-        throw new EmberError('Brace expanded properties cannot contain spaces, ' +
+        throw new EmberError('Brace expanded properties cannot contain spaces, ' + 
           'e.g. `user.{firstName, lastName}` should be `user.{firstName,lastName}`');
       }
 
-      
-        return newExpandProperties(pattern, callback);
-          }
-
-    function oldExpandProperties(pattern, callback) {
-      var match, prefix, list;
-
       if (match = BRACE_EXPANSION.exec(pattern)) {
         prefix = match[1];
         list = match[2];
@@ -14757,41 +14040,8 @@ enifed("ember-metal/expand_properties",
         callback(pattern);
       }
     }
-
-    function newExpandProperties(pattern, callback) {
-      if ('string' === Ember.typeOf(pattern)) {
-        var parts = pattern.split(SPLIT_REGEX);
-        var properties = [parts];
-
-        forEach(parts, function(part, index) {
-          if (part.indexOf(',') >= 0) {
-            properties = duplicateAndReplace(properties, part.split(','), index);
-          }
-        });
-
-        forEach(properties, function(property) {
-          callback(property.join(''));
-        });
-      } else {
-        callback(pattern);
-      }
-    }
-
-    function duplicateAndReplace(properties, currentParts, index) {
-      var all = [];
-
-      forEach(properties, function(property) {
-        forEach(currentParts, function(part) {
-          var current = property.slice(0);
-          current[index] = part;
-          all.push(current);
-        });
-      });
-
-      return all;
-    }
   });
-enifed("ember-metal/get_properties",
+define("ember-metal/get_properties",
   ["ember-metal/property_get","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -14820,9 +14070,9 @@ enifed("ember-metal/get_properties",
       @return {Hash}
     */
     __exports__["default"] = function getProperties(obj) {
-      var ret = {};
-      var propertyNames = arguments;
-      var i = 1;
+      var ret = {},
+          propertyNames = arguments,
+          i = 1;
 
       if (arguments.length === 2 && typeOf(arguments[1]) === 'array') {
         i = 0;
@@ -14834,7 +14084,7 @@ enifed("ember-metal/get_properties",
       return ret;
     }
   });
-enifed("ember-metal/instrumentation",
+define("ember-metal/instrumentation",
   ["ember-metal/core","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -14887,12 +14137,10 @@ enifed("ember-metal/instrumentation",
       @namespace Ember
       @static
     */
-    var subscribers = [];
-    __exports__.subscribers = subscribers;var cache = {};
+    var subscribers = [], cache = {};
 
     var populateListeners = function(name) {
-      var listeners = [];
-      var subscriber;
+      var listeners = [], subscriber;
 
       for (var i=0, l=subscribers.length; i<l; i++) {
         subscriber = subscribers[i];
@@ -14923,72 +14171,56 @@ enifed("ember-metal/instrumentation",
       @param {Function} callback Function that you're instrumenting.
       @param {Object} binding Context that instrument function is called with.
     */
-    function instrument(name, _payload, callback, binding) {
-      if (subscribers.length === 0) {
-        return callback.call(binding);
-      }
-      var payload = _payload || {};
-      var finalizer = _instrumentStart(name, function () {
-        return payload;
-      });
-      if (finalizer) {
-        var tryable = function _instrumenTryable() {
-          return callback.call(binding);
-        };
-        var catchable = function _instrumentCatchable(e) {
-          payload.exception = e;
-        };
-        return tryCatchFinally(tryable, catchable, finalizer);
-      } else {
-        return callback.call(binding);
-      }
-    }
+    function instrument(name, payload, callback, binding) {
+      var listeners = cache[name], timeName, ret;
 
-    __exports__.instrument = instrument;// private for now
-    function _instrumentStart(name, _payload) {
-      var listeners = cache[name];
+      // ES6TODO: Docs. What is this?
+      if (Ember.STRUCTURED_PROFILE) {
+        timeName = name + ": " + payload.object;
+        console.time(timeName);
+      }
 
       if (!listeners) {
         listeners = populateListeners(name);
       }
 
       if (listeners.length === 0) {
-        return;
+        ret = callback.call(binding);
+        if (Ember.STRUCTURED_PROFILE) { console.timeEnd(timeName); }
+        return ret;
       }
 
-      var payload = _payload();
+      var beforeValues = [], listener, i, l;
 
-      var STRUCTURED_PROFILE = Ember.STRUCTURED_PROFILE;
-      var timeName;
-      if (STRUCTURED_PROFILE) {
-        timeName = name + ": " + payload.object;
-        console.time(timeName);
-      }
-
-      var l = listeners.length;
-      var beforeValues = new Array(l);
-      var i, listener;
-      var timestamp = time();
-      for (i=0; i<l; i++) {
-        listener = listeners[i];
-        beforeValues[i] = listener.before(name, timestamp, payload);
-      }
-
-      return function _instrumentEnd() {
-        var i, l, listener;
-        var timestamp = time();
+      function tryable() {
         for (i=0, l=listeners.length; i<l; i++) {
           listener = listeners[i];
-          listener.after(name, timestamp, payload, beforeValues[i]);
+          beforeValues[i] = listener.before(name, time(), payload);
         }
 
-        if (STRUCTURED_PROFILE) {
+        return callback.call(binding);
+      }
+
+      function catchable(e) {
+        payload = payload || {};
+        payload.exception = e;
+      }
+
+      function finalizer() {
+        for (i=0, l=listeners.length; i<l; i++) {
+          listener = listeners[i];
+          listener.after(name, time(), payload, beforeValues[i]);
+        }
+
+        if (Ember.STRUCTURED_PROFILE) {
           console.timeEnd(timeName);
         }
-      };
+      }
+
+      return tryCatchFinally(tryable, catchable, finalizer);
     }
 
-    __exports__._instrumentStart = _instrumentStart;/**
+    __exports__.instrument = instrument;/**
       Subscribes to a particular event or instrumented block of code.
 
       @method subscribe
@@ -15054,13 +14286,13 @@ enifed("ember-metal/instrumentation",
       @namespace Ember.Instrumentation
     */
     function reset() {
-      subscribers.length = 0;
+      subscribers = [];
       cache = {};
     }
 
     __exports__.reset = reset;
   });
-enifed("ember-metal/is_blank",
+define("ember-metal/is_blank",
   ["ember-metal/core","ember-metal/is_empty","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -15095,7 +14327,7 @@ enifed("ember-metal/is_blank",
       return isEmpty(obj) || (typeof obj === 'string' && obj.match(/\S/) === null);
     }
   });
-enifed("ember-metal/is_empty",
+define("ember-metal/is_empty",
   ["ember-metal/core","ember-metal/property_get","ember-metal/is_none","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -15108,7 +14340,7 @@ enifed("ember-metal/is_empty",
       Verifies that a value is `null` or an empty string, empty array,
       or empty function.
 
-      Constrains the rules on `Ember.isNone` by returning true for empty
+      Constrains the rules on `Ember.isNone` by returning false for empty
       string and empty arrays.
 
       ```javascript
@@ -15127,36 +14359,7 @@ enifed("ember-metal/is_empty",
       @return {Boolean}
     */
     function isEmpty(obj) {
-      var none = isNone(obj);
-      if (none) {
-        return none;
-      }
-
-      if (typeof obj.size === 'number') {
-        return !obj.size;
-      }
-
-      var objectType = typeof obj;
-
-      if (objectType === 'object') {
-        var size = get(obj, 'size');
-        if (typeof size === 'number') {
-          return !size;
-        }
-      }
-
-      if (typeof obj.length === 'number' && objectType !== 'function') {
-        return !obj.length;
-      }
-
-      if (objectType === 'object') {
-        var length = get(obj, 'length');
-        if (typeof length === 'number') {
-          return !length;
-        }
-      }
-
-      return false;
+      return isNone(obj) || (obj.length === 0 && typeof obj !== 'function') || (typeof obj === 'object' && get(obj, 'length') === 0);
     }
 
     var empty = Ember.deprecateFunc("Ember.empty is deprecated. Please use Ember.isEmpty instead.", isEmpty);
@@ -15165,7 +14368,7 @@ enifed("ember-metal/is_empty",
     __exports__.isEmpty = isEmpty;
     __exports__.empty = empty;
   });
-enifed("ember-metal/is_none",
+define("ember-metal/is_none",
   ["ember-metal/core","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -15200,109 +14403,7 @@ enifed("ember-metal/is_none",
     __exports__["default"] = isNone;
     __exports__.isNone = isNone;
   });
-enifed("ember-metal/is_present",
-  ["ember-metal/is_blank","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var isBlank = __dependency1__["default"];
-    var isPresent;
-
-    
-      /**
-        A value is present if it not `isBlank`.
-
-        ```javascript
-        Ember.isPresent();                // false
-        Ember.isPresent(null);            // false
-        Ember.isPresent(undefined);       // false
-        Ember.isPresent('');              // false
-        Ember.isPresent([]);              // false
-        Ember.isPresent('\n\t');          // false
-        Ember.isPresent('  ');            // false
-        Ember.isPresent({});              // true
-        Ember.isPresent('\n\t Hello');    // true
-        Ember.isPresent('Hello world');   // true
-        Ember.isPresent([1,2,3]);         // true
-        ```
-
-        @method isPresent
-        @for Ember
-        @param {Object} obj Value to test
-        @return {Boolean}
-        @since 1.7.0
-        */
-      isPresent = function isPresent(obj) {
-        return !isBlank(obj);
-      };
-    
-
-    __exports__["default"] = isPresent;
-  });
-enifed("ember-metal/keys",
-  ["ember-metal/platform","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var canDefineNonEnumerableProperties = __dependency1__.canDefineNonEnumerableProperties;
-
-    /**
-      Returns all of the keys defined on an object or hash. This is useful
-      when inspecting objects for debugging. On browsers that support it, this
-      uses the native `Object.keys` implementation.
-
-      @method keys
-      @for Ember
-      @param {Object} obj
-      @return {Array} Array containing keys of obj
-    */
-    var keys = Object.keys;
-
-    if (!keys || !canDefineNonEnumerableProperties) {
-      // modified from
-      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys
-      keys = (function () {
-        var hasOwnProperty = Object.prototype.hasOwnProperty,
-            hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'),
-            dontEnums = [
-              'toString',
-              'toLocaleString',
-              'valueOf',
-              'hasOwnProperty',
-              'isPrototypeOf',
-              'propertyIsEnumerable',
-              'constructor'
-            ],
-            dontEnumsLength = dontEnums.length;
-
-        return function keys(obj) {
-          if (typeof obj !== 'object' && (typeof obj !== 'function' || obj === null)) {
-            throw new TypeError('Object.keys called on non-object');
-          }
-
-          var result = [], prop, i;
-
-          for (prop in obj) {
-            if (prop !== '_super' &&
-              prop.lastIndexOf('__',0) !== 0 &&
-              hasOwnProperty.call(obj, prop)) {
-              result.push(prop);
-            }
-          }
-
-          if (hasDontEnumBug) {
-            for (i = 0; i < dontEnumsLength; i++) {
-              if (hasOwnProperty.call(obj, dontEnums[i])) {
-                result.push(dontEnums[i]);
-              }
-            }
-          }
-          return result;
-        };
-      }());
-    }
-
-    __exports__["default"] = keys;
-  });
-enifed("ember-metal/libraries",
+define("ember-metal/libraries",
   ["ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -15350,7 +14451,7 @@ enifed("ember-metal/libraries",
 
     __exports__["default"] = libraries;
   });
-enifed("ember-metal/logger",
+define("ember-metal/logger",
   ["ember-metal/core","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -15498,8 +14599,8 @@ enifed("ember-metal/logger",
       assert: consoleMethod('assert') || assertPolyfill
     };
   });
-enifed("ember-metal/map",
-  ["ember-metal/utils","ember-metal/array","ember-metal/platform","ember-metal/deprecate_property","exports"],
+define("ember-metal/map",
+  ["ember-metal/property_set","ember-metal/utils","ember-metal/array","ember-metal/platform","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
@@ -15517,44 +14618,37 @@ enifed("ember-metal/map",
 
       This implementation follows the current iteration of the ES6 proposal for
       maps (http://wiki.ecmascript.org/doku.php?id=harmony:simple_maps_and_sets),
-      with one exception:  as we do not have the luxury of in-VM iteration, we implement a
+      with two exceptions. First, because we need our implementation to be pleasant
+      on older browsers, we do not use the `delete` name (using `remove` instead).
+      Second, as we do not have the luxury of in-VM iteration, we implement a
       forEach method for iteration.
 
       Map is mocked out to look like an Ember object, so you can do
       `Ember.Map.create()` for symmetry with other Ember classes.
     */
 
-    var guidFor = __dependency1__.guidFor;
-    var indexOf = __dependency2__.indexOf;
-    var create = __dependency3__.create;
-    var deprecateProperty = __dependency4__.deprecateProperty;
+    var set = __dependency1__.set;
+    var guidFor = __dependency2__.guidFor;
+    var indexOf = __dependency3__.indexOf;
+    var create = __dependency4__.create;
 
-    function missingFunction(fn) {
-      throw new TypeError('' + Object.prototype.toString.call(fn) + " is not a function");
-    }
-
-    function missingNew(name) {
-      throw new TypeError("Constructor " + name + "requires 'new'");
-    }
-
-    function copyNull(obj) {
-      var output = create(null);
+    function copy(obj) {
+      var output = {};
 
       for (var prop in obj) {
-        // hasOwnPropery is not needed because obj is Object.create(null);
-        output[prop] = obj[prop];
+        if (obj.hasOwnProperty(prop)) { output[prop] = obj[prop]; }
       }
 
       return output;
     }
 
     function copyMap(original, newObject) {
-      var keys = original.keys.copy();
-      var values = copyNull(original.values);
+      var keys = original.keys.copy(),
+          values = copy(original.values);
 
       newObject.keys = keys;
       newObject.values = values;
-      newObject.size = original.size;
+      newObject.length = original.length;
 
       return newObject;
     }
@@ -15570,13 +14664,7 @@ enifed("ember-metal/map",
       @private
     */
     function OrderedSet() {
-
-      if (this instanceof OrderedSet) {
-        this.clear();
-        this._silenceRemoveDeprecation = false;
-      } else {
-        missingNew("OrderedSet");
-      }
+      this.clear();
     }
 
     /**
@@ -15585,78 +14673,48 @@ enifed("ember-metal/map",
       @return {Ember.OrderedSet}
     */
     OrderedSet.create = function() {
-      var Constructor = this;
-
-      return new Constructor();
+      return new OrderedSet();
     };
 
+
     OrderedSet.prototype = {
-      constructor: OrderedSet,
       /**
         @method clear
       */
       clear: function() {
-        this.presenceSet = create(null);
+        this.presenceSet = {};
         this.list = [];
-        this.size = 0;
       },
 
       /**
         @method add
         @param obj
-        @param guid (optional, and for internal use)
-        @return {Ember.OrderedSet}
       */
-      add: function(obj, _guid) {
-        var guid = _guid || guidFor(obj);
-        var presenceSet = this.presenceSet;
-        var list = this.list;
+      add: function(obj) {
+        var guid = guidFor(obj),
+            presenceSet = this.presenceSet,
+            list = this.list;
 
-        if (presenceSet[guid] === true) {
-          return;
-        }
+        if (guid in presenceSet) { return; }
 
         presenceSet[guid] = true;
-        this.size = list.push(obj);
-
-        return this;
+        list.push(obj);
       },
 
       /**
-        @deprecated
-
         @method remove
         @param obj
-        @param _guid (optional and for internal use only)
-        @return {Boolean}
       */
-      remove: function(obj, _guid) {
-        Ember.deprecate('Calling `OrderedSet.prototype.remove` has been deprecated, please use `OrderedSet.prototype.delete` instead.', this._silenceRemoveDeprecation);
+      remove: function(obj) {
+        var guid = guidFor(obj),
+            presenceSet = this.presenceSet,
+            list = this.list;
 
-        return this["delete"](obj, _guid);
-      },
+        delete presenceSet[guid];
 
-      /**
-        @method delete
-        @param obj
-        @param _guid (optional and for internal use only)
-        @return {Boolean}
-      */
-      "delete": function(obj, _guid) {
-        var guid = _guid || guidFor(obj);
-        var presenceSet = this.presenceSet;
-        var list = this.list;
-
-        if (presenceSet[guid] === true) {
-          delete presenceSet[guid];
-          var index = indexOf.call(list, obj);
-          if (index > -1) {
-            list.splice(index, 1);
-          }
-          this.size = list.length;
-          return true;
-        } else {
-          return false;
+        var index = indexOf.call(list, obj);
+        if (index > -1) {
+          list.splice(index, 1);
         }
       },
 
@@ -15665,7 +14723,7 @@ enifed("ember-metal/map",
         @return {Boolean}
       */
       isEmpty: function() {
-        return this.size === 0;
+        return this.list.length === 0;
       },
 
       /**
@@ -15674,12 +14732,10 @@ enifed("ember-metal/map",
         @return {Boolean}
       */
       has: function(obj) {
-        if (this.size === 0) { return false; }
+        var guid = guidFor(obj),
+            presenceSet = this.presenceSet;
 
-        var guid = guidFor(obj);
-        var presenceSet = this.presenceSet;
-
-        return presenceSet[guid] === true;
+        return guid in presenceSet;
       },
 
       /**
@@ -15687,25 +14743,12 @@ enifed("ember-metal/map",
         @param {Function} fn
         @param self
       */
-      forEach: function(fn /*, thisArg*/) {
-        if (typeof fn !== 'function') {
-          missingFunction(fn);
-        }
+      forEach: function(fn, self) {
+        // allow mutation during iteration
+        var list = this.toArray();
 
-        if (this.size === 0) { return; }
-
-        var list = this.list;
-        var length = arguments.length;
-        var i;
-
-        if (length === 2) {
-          for (i = 0; i < list.length; i++) {
-            fn.call(arguments[1], list[i]);
-          }
-        } else {
-          for (i = 0; i < list.length; i++) {
-            fn(list[i]);
-          }
+        for (var i = 0, j = list.length; i < j; i++) {
+          fn.call(self, list[i]);
         }
       },
 
@@ -15722,20 +14765,15 @@ enifed("ember-metal/map",
         @return {Ember.OrderedSet}
       */
       copy: function() {
-        var Constructor = this.constructor;
-        var set = new Constructor();
+        var set = new OrderedSet();
 
-        set._silenceRemoveDeprecation = this._silenceRemoveDeprecation;
-        set.presenceSet = copyNull(this.presenceSet);
+        set.presenceSet = copy(this.presenceSet);
         set.list = this.toArray();
-        set.size = this.size;
 
         return set;
       }
     };
 
-    deprecateProperty(OrderedSet.prototype, 'length', 'size');
-
     /**
       A Map stores values indexed by keys. Unlike JavaScript's
       default Objects, the keys of a Map can be any JavaScript
@@ -15757,14 +14795,8 @@ enifed("ember-metal/map",
       @constructor
     */
     function Map() {
-      if (this instanceof this.constructor) {
-        this.keys = OrderedSet.create();
-        this.keys._silenceRemoveDeprecation = true;
-        this.values = create(null);
-        this.size = 0;
-      } else {
-        missingNew("OrderedSet");
-      }
+      this.keys = OrderedSet.create();
+      this.values = {};
     }
 
     Ember.Map = Map;
@@ -15774,21 +14806,18 @@ enifed("ember-metal/map",
       @static
     */
     Map.create = function() {
-      var Constructor = this;
-      return new Constructor();
+      return new Map();
     };
 
     Map.prototype = {
-      constructor: Map,
-
       /**
         This property will change as the number of objects in the map changes.
 
-        @property size
+        @property length
         @type number
         @default 0
       */
-      size: 0,
+      length: 0,
 
       /**
         Retrieve the value associated with a given key.
@@ -15798,10 +14827,8 @@ enifed("ember-metal/map",
         @return {*} the value associated with the key, or `undefined`
       */
       get: function(key) {
-        if (this.size === 0) { return; }
-
-        var values = this.values;
-        var guid = guidFor(key);
+        var values = this.values,
+            guid = guidFor(key);
 
         return values[guid];
       },
@@ -15813,27 +14840,18 @@ enifed("ember-metal/map",
         @method set
         @param {*} key
         @param {*} value
-        @return {Ember.Map}
       */
       set: function(key, value) {
-        var keys = this.keys;
-        var values = this.values;
-        var guid = guidFor(key);
-
-        // ensure we don't store -0
-        var k = key === -0 ? 0 : key;
-
-        keys.add(k, guid);
+        var keys = this.keys,
+            values = this.values,
+            guid = guidFor(key);
 
+        keys.add(key);
         values[guid] = value;
-
-        this.size = keys.size;
-
-        return this;
+        set(this, 'length', keys.list.length);
       },
 
       /**
-        @deprecated see delete
         Removes a value from the map for an associated key.
 
         @method remove
@@ -15841,29 +14859,16 @@ enifed("ember-metal/map",
         @return {Boolean} true if an item was removed, false otherwise
       */
       remove: function(key) {
-        Ember.deprecate('Calling `Map.prototype.remove` has been deprecated, please use `Map.prototype.delete` instead.');
-
-        return this["delete"](key);
-      },
-
-      /**
-        Removes a value from the map for an associated key.
-
-        @method delete
-        @param {*} key
-        @return {Boolean} true if an item was removed, false otherwise
-      */
-      "delete": function(key) {
-        if (this.size === 0) { return false; }
         // don't use ES6 "delete" because it will be annoying
         // to use in browsers that are not ES6 friendly;
-        var keys = this.keys;
-        var values = this.values;
-        var guid = guidFor(key);
+        var keys = this.keys,
+            values = this.values,
+            guid = guidFor(key);
 
-        if (keys["delete"](key, guid)) {
+        if (values.hasOwnProperty(guid)) {
+          keys.remove(key);
           delete values[guid];
-          this.size = keys.size;
+          set(this, 'length', keys.list.length);
           return true;
         } else {
           return false;
@@ -15878,7 +14883,10 @@ enifed("ember-metal/map",
         @return {Boolean} true if the item was present, false otherwise
       */
       has: function(key) {
-        return this.keys.has(key);
+        var values = this.values,
+            guid = guidFor(key);
+
+        return values.hasOwnProperty(guid);
       },
 
       /**
@@ -15892,38 +14900,14 @@ enifed("ember-metal/map",
         @param {*} self if passed, the `this` value inside the
           callback. By default, `this` is the map.
       */
-      forEach: function(callback /*, thisArg*/) {
-        if (typeof callback !== 'function') {
-          missingFunction(callback);
-        }
+      forEach: function(callback, self) {
+        var keys = this.keys,
+            values = this.values;
 
-        if (this.size === 0) { return; }
-
-        var length = arguments.length;
-        var map = this;
-        var cb, thisArg;
-
-        if (length === 2) {
-          thisArg = arguments[1];
-          cb = function(key) {
-            callback.call(thisArg, map.get(key), key);
-          };
-        } else {
-          cb = function(key) {
-            callback(map.get(key), key);
-          };
-        }
-
-        this.keys.forEach(cb);
-      },
-
-      /**
-        @method clear
-      */
-      clear: function() {
-        this.keys.clear();
-        this.values = create(null);
-        this.size = 0;
+        keys.forEach(function(key) {
+          var guid = guidFor(key);
+          callback.call(self, key, values[guid]);
+        });
       },
 
       /**
@@ -15935,8 +14919,6 @@ enifed("ember-metal/map",
       }
     };
 
-    deprecateProperty(Map.prototype, 'length', 'size');
-
     /**
       @class MapWithDefault
       @namespace Ember
@@ -15947,7 +14929,7 @@ enifed("ember-metal/map",
         @param {*} [options.defaultValue]
     */
     function MapWithDefault(options) {
-      this._super$constructor();
+      Map.call(this);
       this.defaultValue = options.defaultValue;
     }
 
@@ -15968,9 +14950,6 @@ enifed("ember-metal/map",
     };
 
     MapWithDefault.prototype = create(Map.prototype);
-    MapWithDefault.prototype.constructor = MapWithDefault;
-    MapWithDefault.prototype._super$constructor = Map;
-    MapWithDefault.prototype._super$get = Map.prototype.get;
 
     /**
       Retrieve the value associated with a given key.
@@ -15983,7 +14962,7 @@ enifed("ember-metal/map",
       var hasValue = this.has(key);
 
       if (hasValue) {
-        return this._super$get(key);
+        return Map.prototype.get.call(this, key);
       } else {
         var defaultValue = this.defaultValue(key);
         this.set(key, defaultValue);
@@ -15996,24 +14975,19 @@ enifed("ember-metal/map",
       @return {Ember.MapWithDefault}
     */
     MapWithDefault.prototype.copy = function() {
-      var Constructor = this.constructor;
-      return copyMap(this, new Constructor({
+      return copyMap(this, new MapWithDefault({
         defaultValue: this.defaultValue
       }));
     };
 
-    __exports__["default"] = Map;
-
     __exports__.OrderedSet = OrderedSet;
     __exports__.Map = Map;
     __exports__.MapWithDefault = MapWithDefault;
   });
-enifed("ember-metal/merge",
-  ["ember-metal/keys","exports"],
-  function(__dependency1__, __exports__) {
+define("ember-metal/merge",
+  ["exports"],
+  function(__exports__) {
     "use strict";
-    var keys = __dependency1__["default"];
-
     /**
       Merge the contents of two objects together into the first object.
 
@@ -16030,23 +15004,14 @@ enifed("ember-metal/merge",
       @return {Object}
     */
     __exports__["default"] = function merge(original, updates) {
-      if (!updates || typeof updates !== 'object') { 
-        return original;
-      }
-
-      var props = keys(updates);
-      var prop;
-      var length = props.length;
-
-      for (var i = 0; i < length; i++) {
-        prop = props[i];
+      for (var prop in updates) {
+        if (!updates.hasOwnProperty(prop)) { continue; }
         original[prop] = updates[prop];
       }
-
       return original;
     }
   });
-enifed("ember-metal/mixin",
+define("ember-metal/mixin",
   ["ember-metal/core","ember-metal/merge","ember-metal/array","ember-metal/platform","ember-metal/utils","ember-metal/expand_properties","ember-metal/properties","ember-metal/computed","ember-metal/binding","ember-metal/observer","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
         // Remove "use strict"; from transpiled module until
@@ -16068,10 +15033,10 @@ enifed("ember-metal/mixin",
     var create = __dependency4__.create;
     var guidFor = __dependency5__.guidFor;
     var meta = __dependency5__.meta;
+    var META_KEY = __dependency5__.META_KEY;
     var wrap = __dependency5__.wrap;
     var makeArray = __dependency5__.makeArray;
     var apply = __dependency5__.apply;
-    var isArray = __dependency5__.isArray;
     var expandProperties = __dependency6__["default"];
     var Descriptor = __dependency7__.Descriptor;
     var defineProperty = __dependency7__.defineProperty;
@@ -16084,32 +15049,26 @@ enifed("ember-metal/mixin",
     var addListener = __dependency11__.addListener;
     var removeListener = __dependency11__.removeListener;
 
-    var REQUIRED;
-    var a_map = map;
-    var a_indexOf = indexOf;
-    var a_forEach = forEach;
-    var a_slice = [].slice;
-    var o_create = create;
-    var metaFor = meta;
+    var REQUIRED,
+        a_map = map,
+        a_indexOf = indexOf,
+        a_forEach = forEach,
+        a_slice = [].slice,
+        o_create = create,
+        metaFor = meta;
 
     function superFunction(){
-      var func = this.__nextSuper;
-      var ret;
+      var ret, func = this.__nextSuper;
       if (func) {
-        var args = new Array(arguments.length);
-        for (var i = 0, l = args.length; i < l; i++) {
-          args[i] = arguments[i];
-        }
         this.__nextSuper = null;
-        ret = apply(this, func, args);
+        ret = apply(this, func, arguments);
         this.__nextSuper = func;
       }
       return ret;
     }
 
     function mixinsMeta(obj) {
-      var m = metaFor(obj, true);
-      var ret = m.mixins;
+      var m = metaFor(obj, true), ret = m.mixins;
       if (!ret) {
         ret = m.mixins = {};
       } else if (!m.hasOwnProperty('mixins')) {
@@ -16180,7 +15139,7 @@ enifed("ember-metal/mixin",
       // it on the original object.
       superProperty = superProperty || meta.descs[key];
 
-      if (superProperty === undefined || !(superProperty instanceof ComputedProperty)) {
+      if (!superProperty || !(superProperty instanceof ComputedProperty)) {
         return property;
       }
 
@@ -16207,7 +15166,7 @@ enifed("ember-metal/mixin",
       superMethod = superMethod || obj[key];
 
       // Only wrap the new method if the original method was a function
-      if (superMethod === undefined || 'function' !== typeof superMethod) {
+      if ('function' !== typeof superMethod) {
         return method;
       }
 
@@ -16231,13 +15190,10 @@ enifed("ember-metal/mixin",
     function applyMergedProperties(obj, key, value, values) {
       var baseValue = values[key] || obj[key];
 
-      Ember.assert("You passed in `" + JSON.stringify(value) + "` as the value for `" + key +
-                   "` but `" + key + "` cannot be an Array", !isArray(value));
-
       if (!baseValue) { return value; }
 
-      var newBase = merge({}, baseValue);
-      var hasFunction = false;
+      var newBase = merge({}, baseValue),
+          hasFunction = false;
 
       for (var prop in value) {
         if (!value.hasOwnProperty(prop)) { continue; }
@@ -16340,8 +15296,7 @@ enifed("ember-metal/mixin",
 
     function connectBindings(obj, m) {
       // TODO Mixin.apply(instance) should disconnect binding if exists
-      var bindings = m.bindings;
-      var key, binding, to;
+      var bindings = m.bindings, key, binding, to;
       if (bindings) {
         for (key in bindings) {
           binding = bindings[key];
@@ -16368,8 +15323,7 @@ enifed("ember-metal/mixin",
     }
 
     function followAlias(obj, desc, m, descs, values) {
-      var altKey = desc.methodName;
-      var value;
+      var altKey = desc.methodName, value;
       if (descs[altKey] || values[altKey]) {
         value = values[altKey];
         desc  = descs[altKey];
@@ -16411,11 +15365,8 @@ enifed("ember-metal/mixin",
     }
 
     function applyMixin(obj, mixins, partial) {
-      var descs = {};
-      var values = {};
-      var m = metaFor(obj);
-      var keys = [];
-      var key, value, desc;
+      var descs = {}, values = {}, m = metaFor(obj),
+          key, value, desc, keys = [];
 
       obj._super = superFunction;
 
@@ -16574,9 +15525,7 @@ enifed("ember-metal/mixin",
         this.mixins = [];
       }
 
-      var len = arguments.length;
-      var mixins = this.mixins;
-      var idx;
+      var len = arguments.length, mixins = this.mixins, idx;
 
       for(idx=0; idx < len; idx++) {
         mixin = arguments[idx];
@@ -16615,8 +15564,7 @@ enifed("ember-metal/mixin",
       seen[guid] = true;
 
       if (curMixin === targetMixin) { return true; }
-      var mixins = curMixin.mixins;
-      var loc = mixins ? mixins.length : 0;
+      var mixins = curMixin.mixins, loc = mixins ? mixins.length : 0;
       while (--loc >= 0) {
         if (_detect(mixins[loc], targetMixin, seen)) { return true; }
       }
@@ -16631,8 +15579,8 @@ enifed("ember-metal/mixin",
     MixinPrototype.detect = function(obj) {
       if (!obj) { return false; }
       if (obj instanceof Mixin) { return _detect(obj, this, {}); }
-      var m = obj['__ember_meta__'];
-      var mixins = m && m.mixins;
+      var m = obj[META_KEY],
+          mixins = m && m.mixins;
       if (mixins) {
         return !!mixins[guidFor(this)];
       }
@@ -16660,9 +15608,7 @@ enifed("ember-metal/mixin",
     }
 
     MixinPrototype.keys = function() {
-      var keys = {};
-      var seen = {};
-      var ret = [];
+      var keys = {}, seen = {}, ret = [];
       _keys(keys, this, seen);
       for(var key in keys) {
         if (keys.hasOwnProperty(key)) { ret.push(key); }
@@ -16673,9 +15619,8 @@ enifed("ember-metal/mixin",
     // returns the mixins currently applied to the specified object
     // TODO: Make Ember.mixin
     Mixin.mixins = function(obj) {
-      var m = obj['__ember_meta__'];
-      var mixins = m && m.mixins;
-      var ret = [];
+      var m = obj[META_KEY],
+          mixins = m && m.mixins, ret = [];
 
       if (!mixins) { return ret; }
 
@@ -16720,7 +15665,7 @@ enifed("ember-metal/mixin",
       });
 
       var goodGuy = App.Person.create();
-
+      
       goodGuy.name();    // 'Tomhuda Katzdale'
       goodGuy.moniker(); // 'Tomhuda Katzdale'
       ```
@@ -16895,7 +15840,7 @@ enifed("ember-metal/mixin",
     __exports__.beforeObserver = beforeObserver;__exports__.IS_BINDING = IS_BINDING;
     __exports__.Mixin = Mixin;
   });
-enifed("ember-metal/observer",
+define("ember-metal/observer",
   ["ember-metal/watching","ember-metal/array","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -17014,7 +15959,7 @@ enifed("ember-metal/observer",
 
     __exports__.removeBeforeObserver = removeBeforeObserver;
   });
-enifed("ember-metal/observer_set",
+define("ember-metal/observer_set",
   ["ember-metal/utils","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -17046,11 +15991,11 @@ enifed("ember-metal/observer_set",
 
 
     ObserverSet.prototype.add = function(sender, keyName, eventName) {
-      var observerSet = this.observerSet;
-      var observers = this.observers;
-      var senderGuid = guidFor(sender);
-      var keySet = observerSet[senderGuid];
-      var index;
+      var observerSet = this.observerSet,
+          observers = this.observers,
+          senderGuid = guidFor(sender),
+          keySet = observerSet[senderGuid],
+          index;
 
       if (!keySet) {
         observerSet[senderGuid] = keySet = {};
@@ -17069,8 +16014,7 @@ enifed("ember-metal/observer_set",
     };
 
     ObserverSet.prototype.flush = function() {
-      var observers = this.observers;
-      var i, len, observer, sender;
+      var observers = this.observers, i, len, observer, sender;
       this.clear();
       for (i=0, len=observers.length; i < len; ++i) {
         observer = observers[i];
@@ -17085,62 +16029,22 @@ enifed("ember-metal/observer_set",
       this.observers = [];
     };
   });
-enifed("ember-metal/path_cache",
-  ["ember-metal/cache","exports"],
+define("ember-metal/platform",
+  ["ember-metal/core","exports"],
   function(__dependency1__, __exports__) {
-    "use strict";
-    var Cache = __dependency1__["default"];
+        // Remove "use strict"; from transpiled module (in browser builds only) until
+    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+    //
+    // REMOVE_USE_STRICT: true
 
-    var IS_GLOBAL      = /^([A-Z$]|([0-9][A-Z$]))/;
-    var IS_GLOBAL_PATH = /^([A-Z$]|([0-9][A-Z$])).*[\.]/;
-    var HAS_THIS       = 'this.';
+    /*globals Node */
 
-    var isGlobalCache     = new Cache(1000, function(key) { return IS_GLOBAL.test(key);          });
-    var isGlobalPathCache = new Cache(1000, function(key) { return IS_GLOBAL_PATH.test(key);     });
-    var hasThisCache      = new Cache(1000, function(key) { return key.indexOf(HAS_THIS) !== -1; });
-    var isPathCache       = new Cache(1000, function(key) { return key.indexOf('.')      !== -1; });
-
-    var caches = {
-      isGlobalCache:     isGlobalCache,
-      isGlobalPathCache: isGlobalPathCache,
-      hasThisCache:      hasThisCache,
-      isPathCache:       isPathCache
-    };
-    __exports__.caches = caches;
-    function isGlobal(path) {
-      return isGlobalCache.get(path);
-    }
-
-    __exports__.isGlobal = isGlobal;function isGlobalPath(path) {
-      return isGlobalPathCache.get(path);
-    }
-
-    __exports__.isGlobalPath = isGlobalPath;function hasThis(path) {
-      return hasThisCache.get(path);
-    }
-
-    __exports__.hasThis = hasThis;function isPath(path) {
-      return isPathCache.get(path);
-    }
-
-    __exports__.isPath = isPath;
-  });
-enifed("ember-metal/platform",
-  ["ember-metal/platform/define_property","ember-metal/platform/define_properties","ember-metal/platform/create","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
-    "use strict";
-    var hasES5CompliantDefineProperty = __dependency1__.hasES5CompliantDefineProperty;
-    var defineProperty = __dependency1__.defineProperty;
-    var defineProperties = __dependency2__["default"];
-    var create = __dependency3__["default"];
+    var Ember = __dependency1__["default"];
 
     /**
     @module ember-metal
     */
 
-    var hasPropertyAccessors = hasES5CompliantDefineProperty;
-    var canDefineNonEnumerableProperties = hasES5CompliantDefineProperty;
-
     /**
       Platform specific methods and feature detectors needed by the framework.
 
@@ -17148,26 +16052,8 @@ enifed("ember-metal/platform",
       @namespace Ember
       @static
     */
-
-    __exports__.create = create;
-    __exports__.defineProperty = defineProperty;
-    __exports__.defineProperties = defineProperties;
-    __exports__.hasPropertyAccessors = hasPropertyAccessors;
-    __exports__.canDefineNonEnumerableProperties = canDefineNonEnumerableProperties;
-  });
-enifed("ember-metal/platform/create",
-  ["exports"],
-  function(__exports__) {
-        // Remove "use strict"; from transpiled module until
-    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
-    //
-    // REMOVE_USE_STRICT: true
-
-    /**
-    @class platform
-    @namespace Ember
-    @static
-    */
+    // TODO remove this
+    var platform = {};
 
     /**
       Identical to `Object.create()`. Implements if not available natively.
@@ -17175,190 +16061,76 @@ enifed("ember-metal/platform/create",
       @method create
       @for Ember
     */
-    var create;
-    // ES5 15.2.3.5
-    // http://es5.github.com/#x15.2.3.5
-    if (!(Object.create && !Object.create(null).hasOwnProperty)) {
-      /* jshint scripturl:true, proto:true */
-      // Contributed by Brandon Benvie, October, 2012
-      var createEmpty;
-      var supportsProto = !({'__proto__':null} instanceof Object);
-      // the following produces false positives
-      // in Opera Mini => not a reliable check
-      // Object.prototype.__proto__ === null
-      if (supportsProto || typeof document === 'undefined') {
-        createEmpty = function () {
-          return { "__proto__": null };
-        };
-      } else {
-        // In old IE __proto__ can't be used to manually set `null`, nor does
-        // any other method exist to make an object that inherits from nothing,
-        // aside from Object.prototype itself. Instead, create a new global
-        // object and *steal* its Object.prototype and strip it bare. This is
-        // used as the prototype to create nullary objects.
-        createEmpty = function () {
-          var iframe = document.createElement('iframe');
-          var parent = document.body || document.documentElement;
-          iframe.style.display = 'none';
-          parent.appendChild(iframe);
-          iframe.src = 'javascript:';
-          var empty = iframe.contentWindow.Object.prototype;
-          parent.removeChild(iframe);
-          iframe = null;
-          delete empty.constructor;
-          delete empty.hasOwnProperty;
-          delete empty.propertyIsEnumerable;
-          delete empty.isPrototypeOf;
-          delete empty.toLocaleString;
-          delete empty.toString;
-          delete empty.valueOf;
+    var create = Object.create;
 
-          function Empty() {}
-          Empty.prototype = empty;
-          // short-circuit future calls
-          createEmpty = function () {
-            return new Empty();
-          };
-          return new Empty();
-        };
+    // IE8 has Object.create but it couldn't treat property descriptors.
+    if (create) {
+      if (create({a: 1}, {a: {value: 2}}).a !== 2) {
+        create = null;
       }
-
-      create = Object.create = function create(prototype, properties) {
-
-        var object;
-        function Type() {}  // An empty constructor.
-
-        if (prototype === null) {
-          object = createEmpty();
-        } else {
-          if (typeof prototype !== "object" && typeof prototype !== "function") {
-            // In the native implementation `parent` can be `null`
-            // OR *any* `instanceof Object`  (Object|Function|Array|RegExp|etc)
-            // Use `typeof` tho, b/c in old IE, DOM elements are not `instanceof Object`
-            // like they are in modern browsers. Using `Object.create` on DOM elements
-            // is...err...probably inappropriate, but the native version allows for it.
-            throw new TypeError("Object prototype may only be an Object or null"); // same msg as Chrome
-          }
-
-          Type.prototype = prototype;
-
-          object = new Type();
-        }
-
-        if (properties !== undefined) {
-          Object.defineProperties(object, properties);
-        }
-
-        return object;
-      };
-    } else {
-      create = Object.create;
     }
 
-    __exports__["default"] = create;
-  });
-enifed("ember-metal/platform/define_properties",
-  ["ember-metal/platform/define_property","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var defineProperty = __dependency1__.defineProperty;
+    // STUB_OBJECT_CREATE allows us to override other libraries that stub
+    // Object.create different than we would prefer
+    if (!create || Ember.ENV.STUB_OBJECT_CREATE) {
+      var K = function() {};
 
-    var defineProperties = Object.defineProperties;
-
-    // ES5 15.2.3.7
-    // http://es5.github.com/#x15.2.3.7
-    if (!defineProperties) {
-      defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-          if (properties.hasOwnProperty(property) && property !== "__proto__") {
-            defineProperty(object, property, properties[property]);
+      create = function(obj, props) {
+        K.prototype = obj;
+        obj = new K();
+        if (props) {
+          K.prototype = obj;
+          for (var prop in props) {
+            K.prototype[prop] = props[prop].value;
           }
+          obj = new K();
         }
-        return object;
+        K.prototype = null;
+
+        return obj;
       };
 
-      Object.defineProperties = defineProperties;
+      create.isSimulated = true;
     }
 
-    __exports__["default"] = defineProperties;
-  });
-enifed("ember-metal/platform/define_property",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    /*globals Node */
+    var defineProperty = Object.defineProperty;
+    var canRedefineProperties, canDefinePropertyOnDOM;
 
-    /**
-    @class platform
-    @namespace Ember
-    @static
-    */
-
-    /**
-      Set to true if the platform supports native getters and setters.
-
-      @property hasPropertyAccessors
-      @final
-    */
-
-    /**
-      Identical to `Object.defineProperty()`. Implements as much functionality
-      as possible if not available natively.
-
-      @method defineProperty
-      @param {Object} obj The object to modify
-      @param {String} keyName property name to modify
-      @param {Object} desc descriptor hash
-      @return {void}
-    */
-    var defineProperty = (function checkCompliance(defineProperty) {
-      if (!defineProperty) return;
+    // Catch IE8 where Object.defineProperty exists but only works on DOM elements
+    if (defineProperty) {
       try {
-        var a = 5;
+        defineProperty({}, 'a',{get:function() {}});
+      } catch (e) {
+        defineProperty = null;
+      }
+    }
+
+    if (defineProperty) {
+      // Detects a bug in Android <3.2 where you cannot redefine a property using
+      // Object.defineProperty once accessors have already been set.
+      canRedefineProperties = (function() {
         var obj = {};
+
         defineProperty(obj, 'a', {
           configurable: true,
           enumerable: true,
-          get: function () {
-            return a;
-          },
-          set: function (v) {
-            a = v;
-          }
+          get: function() { },
+          set: function() { }
         });
-        if (obj.a !== 5) return;
-        obj.a = 10;
-        if (a !== 10) return;
 
-        // check non-enumerability
         defineProperty(obj, 'a', {
           configurable: true,
-          enumerable: false,
+          enumerable: true,
           writable: true,
           value: true
         });
-        for (var key in obj) {
-          if (key === 'a') return;
-        }
 
-        // Detects a bug in Android <3.2 where you cannot redefine a property using
-        // Object.defineProperty once accessors have already been set.
-        if (obj.a !== true) return;
+        return obj.a === true;
+      })();
 
-        // defineProperty is compliant
-        return defineProperty;
-      } catch (e) {
-        // IE8 defines Object.defineProperty but calling it on an Object throws
-        return;
-      }
-    })(Object.defineProperty);
-
-    var hasES5CompliantDefineProperty = !!defineProperty;
-
-    if (hasES5CompliantDefineProperty && typeof document !== 'undefined') {
       // This is for Safari 5.0, which supports Object.defineProperty, but not
       // on DOM nodes.
-      var canDefinePropertyOnDOM = (function() {
+      canDefinePropertyOnDOM = (function() {
         try {
           defineProperty(document.createElement('div'), 'definePropertyOnDOM', {});
           return true;
@@ -17367,7 +16139,9 @@ enifed("ember-metal/platform/define_property",
         return false;
       })();
 
-      if (!canDefinePropertyOnDOM) {
+      if (!canRedefineProperties) {
+        defineProperty = null;
+      } else if (!canDefinePropertyOnDOM) {
         defineProperty = function(obj, keyName, desc) {
           var isNode;
 
@@ -17387,28 +16161,69 @@ enifed("ember-metal/platform/define_property",
       }
     }
 
-    if (!hasES5CompliantDefineProperty) {
-      defineProperty = function defineProperty(obj, keyName, desc) {
+    /**
+    @class platform
+    @namespace Ember
+    */
+
+    /**
+      Identical to `Object.defineProperty()`. Implements as much functionality
+      as possible if not available natively.
+
+      @method defineProperty
+      @param {Object} obj The object to modify
+      @param {String} keyName property name to modify
+      @param {Object} desc descriptor hash
+      @return {void}
+    */
+    platform.defineProperty = defineProperty;
+
+    /**
+      Set to true if the platform supports native getters and setters.
+
+      @property hasPropertyAccessors
+      @final
+    */
+    platform.hasPropertyAccessors = true;
+
+    if (!platform.defineProperty) {
+      platform.hasPropertyAccessors = false;
+
+      platform.defineProperty = function(obj, keyName, desc) {
         if (!desc.get) { obj[keyName] = desc.value; }
       };
+
+      platform.defineProperty.isSimulated = true;
     }
 
-    __exports__.hasES5CompliantDefineProperty = hasES5CompliantDefineProperty;
-    __exports__.defineProperty = defineProperty;
+    if (Ember.ENV.MANDATORY_SETTER && !platform.hasPropertyAccessors) {
+      Ember.ENV.MANDATORY_SETTER = false;
+    }
+
+    __exports__.create = create;
+    __exports__.platform = platform;
   });
-enifed("ember-metal/properties",
-  ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/property_events","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+define("ember-metal/properties",
+  ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/property_events","ember-metal/property_get","ember-metal/property_set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
     /**
     @module ember-metal
     */
 
     var Ember = __dependency1__["default"];
-    var metaFor = __dependency2__.meta;
-    var objectDefineProperty = __dependency3__.defineProperty;
-    var hasPropertyAccessors = __dependency3__.hasPropertyAccessors;
+    var META_KEY = __dependency2__.META_KEY;
+    var meta = __dependency2__.meta;
+    var platform = __dependency3__.platform;
     var overrideChains = __dependency4__.overrideChains;
+    var get = __dependency5__.get;
+    var set = __dependency6__.set;
+
+    var metaFor = meta,
+        objectDefineProperty = platform.defineProperty;
+
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
+
     // ..........................................................
     // DESCRIPTOR
     //
@@ -17430,20 +16245,18 @@ enifed("ember-metal/properties",
     // DEFINING PROPERTIES API
     //
 
-    function MANDATORY_SETTER_FUNCTION(name) {
-      return function SETTER_FUNCTION(value) {
-        Ember.assert("You must use Ember.set() to set the `" + name + "` property (of " + this + ") to `" + value + "`.", false);
-      };
-    }
+    var MANDATORY_SETTER_FUNCTION = Ember.MANDATORY_SETTER_FUNCTION = function(value) {
+      Ember.assert("You must use Ember.set() to access this property (of " + this + ")", false);
+    };
 
-    __exports__.MANDATORY_SETTER_FUNCTION = MANDATORY_SETTER_FUNCTION;function DEFAULT_GETTER_FUNCTION(name) {
-      return function GETTER_FUNCTION() {
-        var meta = this['__ember_meta__'];
+    var DEFAULT_GETTER_FUNCTION = Ember.DEFAULT_GETTER_FUNCTION = function DEFAULT_GETTER_FUNCTION(name) {
+      return function() {
+        var meta = this[META_KEY];
         return meta && meta.values[name];
       };
-    }
+    };
 
-    __exports__.DEFAULT_GETTER_FUNCTION = DEFAULT_GETTER_FUNCTION;/**
+    /**
       NOTE: This is a low-level method used by other parts of the API. You almost
       never want to call this method directly. Instead you should use
       `Ember.mixin()` to define new properties.
@@ -17494,9 +16307,7 @@ enifed("ember-metal/properties",
       if (!meta) meta = metaFor(obj);
       descs = meta.descs;
       existingDesc = meta.descs[keyName];
-      var watchEntry = meta.watching[keyName];
-
-      watching = watchEntry !== undefined && watchEntry > 0;
+      watching = meta.watching[keyName] > 0;
 
       if (existingDesc instanceof Descriptor) {
         existingDesc.teardown(obj, keyName);
@@ -17506,36 +16317,34 @@ enifed("ember-metal/properties",
         value = desc;
 
         descs[keyName] = desc;
-        
-          if (watching && hasPropertyAccessors) {
-            objectDefineProperty(obj, keyName, {
-              configurable: true,
-              enumerable: true,
-              writable: true,
-              value: undefined // make enumerable
-            });
-          } else {
-            obj[keyName] = undefined; // make enumerable
-          }
-                if (desc.setup) { desc.setup(obj, keyName); }
+        if (MANDATORY_SETTER && watching) {
+          objectDefineProperty(obj, keyName, {
+            configurable: true,
+            enumerable: true,
+            writable: true,
+            value: undefined // make enumerable
+          });
+        } else {
+          obj[keyName] = undefined; // make enumerable
+        }
+        if (desc.setup) { desc.setup(obj, keyName); }
       } else {
         descs[keyName] = undefined; // shadow descriptor in proto
         if (desc == null) {
           value = data;
 
-          
-            if (watching && hasPropertyAccessors) {
-              meta.values[keyName] = data;
-              objectDefineProperty(obj, keyName, {
-                configurable: true,
-                enumerable: true,
-                set: MANDATORY_SETTER_FUNCTION(keyName),
-                get: DEFAULT_GETTER_FUNCTION(keyName)
-              });
-            } else {
-              obj[keyName] = data;
-            }
-                  } else {
+          if (MANDATORY_SETTER && watching) {
+            meta.values[keyName] = data;
+            objectDefineProperty(obj, keyName, {
+              configurable: true,
+              enumerable: true,
+              set: MANDATORY_SETTER_FUNCTION,
+              get: DEFAULT_GETTER_FUNCTION(keyName)
+            });
+          } else {
+            obj[keyName] = data;
+          }
+        } else {
           value = desc;
 
           // compatibility with ES5
@@ -17553,12 +16362,41 @@ enifed("ember-metal/properties",
 
       return this;
     }
-    __exports__.defineProperty = defineProperty;
+
+    __exports__.defineProperty = defineProperty;/**
+      Used internally to allow changing properties in a backwards compatible way, and print a helpful
+      deprecation warning.
+
+      @method deprecateProperty
+      @param {Object} object The object to add the deprecated property to.
+      @param {String} deprecatedKey The property to add (and print deprecation warnings upon accessing).
+      @param {String} newKey The property that will be aliased.
+      @private
+      @since 1.7.0
+    */
+
+    function deprecateProperty(object, deprecatedKey, newKey) {
+      function deprecate() {
+        Ember.deprecate('Usage of `' + deprecatedKey + '` is deprecated, use `' + newKey + '` instead.');
+      }
+
+      if (platform.hasPropertyAccessors) {
+        defineProperty(object, deprecatedKey, {
+            configurable: true,
+            enumerable: false,
+            set: function(value) { deprecate(); set(this, newKey, value); },
+            get: function() { deprecate(); return get(this, newKey); }
+        });
+      }
+    }
+
+    __exports__.deprecateProperty = deprecateProperty;
   });
-enifed("ember-metal/property_events",
+define("ember-metal/property_events",
   ["ember-metal/utils","ember-metal/events","ember-metal/observer_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
+    var META_KEY = __dependency1__.META_KEY;
     var guidFor = __dependency1__.guidFor;
     var tryFinally = __dependency1__.tryFinally;
     var sendEvent = __dependency2__.sendEvent;
@@ -17590,10 +16428,10 @@ enifed("ember-metal/property_events",
       @return {void}
     */
     function propertyWillChange(obj, keyName) {
-      var m = obj['__ember_meta__'];
-      var watching = (m && m.watching[keyName] > 0) || keyName === 'length';
-      var proto = m && m.proto;
-      var desc = m && m.descs[keyName];
+      var m = obj[META_KEY],
+          watching = (m && m.watching[keyName] > 0) || keyName === 'length',
+          proto = m && m.proto,
+          desc = m && m.descs[keyName];
 
       if (!watching) { return; }
       if (proto === obj) { return; }
@@ -17619,10 +16457,10 @@ enifed("ember-metal/property_events",
       @return {void}
     */
     function propertyDidChange(obj, keyName) {
-      var m = obj['__ember_meta__'];
-      var watching = (m && m.watching[keyName] > 0) || keyName === 'length';
-      var proto = m && m.proto;
-      var desc = m && m.descs[keyName];
+      var m = obj[META_KEY],
+          watching = (m && m.watching[keyName] > 0) || keyName === 'length',
+          proto = m && m.proto,
+          desc = m && m.descs[keyName];
 
       if (proto === obj) { return; }
 
@@ -17630,63 +16468,44 @@ enifed("ember-metal/property_events",
       if (desc && desc.didChange) { desc.didChange(obj, keyName); }
       if (!watching && keyName !== 'length') { return; }
 
-      if (m && m.deps && m.deps[keyName]) {
-        dependentKeysDidChange(obj, keyName, m);
-      }
-
+      dependentKeysDidChange(obj, keyName, m);
       chainsDidChange(obj, keyName, m, false);
       notifyObservers(obj, keyName);
     }
 
     var WILL_SEEN, DID_SEEN;
+
     // called whenever a property is about to change to clear the cache of any dependent keys (and notify those properties of changes, etc...)
     function dependentKeysWillChange(obj, depKey, meta) {
       if (obj.isDestroying) { return; }
 
-      var deps;
-      if (meta && meta.deps && (deps = meta.deps[depKey])) {
-        var seen = WILL_SEEN;
-        var top = !seen;
-        if (top) { seen = WILL_SEEN = {}; }
-        iterDeps(propertyWillChange, obj, deps, depKey, seen, meta);
-        if (top) { WILL_SEEN = null; }
-      }
+      var seen = WILL_SEEN, top = !seen;
+      if (top) { seen = WILL_SEEN = {}; }
+      iterDeps(propertyWillChange, obj, depKey, seen, meta);
+      if (top) { WILL_SEEN = null; }
     }
 
     // called whenever a property has just changed to update dependent keys
     function dependentKeysDidChange(obj, depKey, meta) {
       if (obj.isDestroying) { return; }
 
-      var deps;
-      if (meta && meta.deps && (deps = meta.deps[depKey])) {
-        var seen = DID_SEEN;
-        var top = !seen;
-        if (top) { seen = DID_SEEN = {}; }
-        iterDeps(propertyDidChange, obj, deps, depKey, seen, meta);
-        if (top) { DID_SEEN = null; }
-      }
+      var seen = DID_SEEN, top = !seen;
+      if (top) { seen = DID_SEEN = {}; }
+      iterDeps(propertyDidChange, obj, depKey, seen, meta);
+      if (top) { DID_SEEN = null; }
     }
 
-    function keysOf(obj) {
-      var keys = [];
-      for (var key in obj) keys.push(key);
-      return keys;
-    }
-
-    function iterDeps(method, obj, deps, depKey, seen, meta) {
-      var keys, key, i, desc;
+    function iterDeps(method, obj, depKey, seen, meta) {
       var guid = guidFor(obj);
-      var current = seen[guid];
-      if (!current) current = seen[guid] = {};
-      if (current[depKey]) return;
-      current[depKey] = true;
+      if (!seen[guid]) seen[guid] = {};
+      if (seen[guid][depKey]) return;
+      seen[guid][depKey] = true;
 
+      var deps = meta.deps;
+      deps = deps && deps[depKey];
       if (deps) {
-        keys = keysOf(deps);
-        var descs = meta.descs;
-        for (i=0; i<keys.length; i++) {
-          key = keys[i];
-          desc = descs[key];
+        for(var key in deps) {
+          var desc = meta.descs[key];
           if (desc && desc._suspended === obj) continue;
           method(obj, key);
         }
@@ -17699,9 +16518,9 @@ enifed("ember-metal/property_events",
         return;
       }
 
-      var nodes = m.chainWatchers[keyName];
-      var events = [];
-      var i, l;
+      var nodes = m.chainWatchers[keyName],
+          events = [],
+          i, l;
 
       for(i = 0, l = nodes.length; i < l; i++) {
         nodes[i].willChange(events);
@@ -17718,9 +16537,9 @@ enifed("ember-metal/property_events",
         return;
       }
 
-      var nodes = m.chainWatchers[keyName];
-      var events = suppressEvents ? null : [];
-      var i, l;
+      var nodes = m.chainWatchers[keyName],
+          events = suppressEvents ? null : [],
+          i, l;
 
       for(i = 0, l = nodes.length; i < l; i++) {
         nodes[i].didChange(events);
@@ -17783,8 +16602,7 @@ enifed("ember-metal/property_events",
     function notifyBeforeObservers(obj, keyName) {
       if (obj.isDestroying) { return; }
 
-      var eventName = keyName + ':before';
-      var listeners, diff;
+      var eventName = keyName + ':before', listeners, diff;
       if (deferred) {
         listeners = beforeObserverSet.add(obj, keyName, eventName);
         diff = listenersDiff(obj, eventName, listeners);
@@ -17797,8 +16615,7 @@ enifed("ember-metal/property_events",
     function notifyObservers(obj, keyName) {
       if (obj.isDestroying) { return; }
 
-      var eventName = keyName + ':change';
-      var listeners;
+      var eventName = keyName + ':change', listeners;
       if (deferred) {
         listeners = observerSet.add(obj, keyName, eventName);
         listenersUnion(obj, eventName, listeners);
@@ -17814,21 +16631,24 @@ enifed("ember-metal/property_events",
     __exports__.endPropertyChanges = endPropertyChanges;
     __exports__.changeProperties = changeProperties;
   });
-enifed("ember-metal/property_get",
-  ["ember-metal/core","ember-metal/error","ember-metal/path_cache","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+define("ember-metal/property_get",
+  ["ember-metal/core","ember-metal/utils","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     /**
     @module ember-metal
     */
 
     var Ember = __dependency1__["default"];
-    var EmberError = __dependency2__["default"];
-    var isGlobalPath = __dependency3__.isGlobalPath;
-    var isPath = __dependency3__.isPath;
-    var pathHasThis = __dependency3__.hasThis;
-    var hasPropertyAccessors = __dependency4__.hasPropertyAccessors;
+    var META_KEY = __dependency2__.META_KEY;
+    var EmberError = __dependency3__["default"];
 
+    var get;
+
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
+
+    var IS_GLOBAL_PATH = /^([A-Z$]|([0-9][A-Z$])).*[\.]/;
+    var HAS_THIS  = 'this.';
     var FIRST_KEY = /^([^\.]+)/;
 
     // ..........................................................
@@ -17868,7 +16688,7 @@ enifed("ember-metal/property_get",
         return obj;
       }
 
-      if (!keyName && 'string' === typeof obj) {
+      if (!keyName && 'string'===typeof obj) {
         keyName = obj;
         obj = null;
       }
@@ -17876,33 +16696,23 @@ enifed("ember-metal/property_get",
       Ember.assert("Cannot call get with "+ keyName +" key.", !!keyName);
       Ember.assert("Cannot call get with '"+ keyName +"' on an undefined object.", obj !== undefined);
 
-      if (obj === null) {
-        var value = _getPath(obj, keyName);
-        Ember.deprecate(
-          "Ember.get fetched '"+keyName+"' from the global context. This behavior will change in the future (issue #3852)",
-          !value || (obj && obj !== Ember.lookup) || isPath(keyName) || isGlobalPath(keyName+".") // Add a . to ensure simple paths are matched.
-        );
-        return value;
-      }
+      if (obj === null) { return _getPath(obj, keyName);  }
 
-      var meta = obj['__ember_meta__'];
-      var desc = meta && meta.descs[keyName];
-      var ret;
+      var meta = obj[META_KEY], desc = meta && meta.descs[keyName], ret;
 
-      if (desc === undefined && isPath(keyName)) {
+      if (desc === undefined && keyName.indexOf('.') !== -1) {
         return _getPath(obj, keyName);
       }
 
       if (desc) {
         return desc.get(obj, keyName);
       } else {
-        
-          if (hasPropertyAccessors && meta && meta.watching[keyName] > 0) {
-            ret = meta.values[keyName];
-          } else {
-            ret = obj[keyName];
-          }
-        
+        if (MANDATORY_SETTER && meta && meta.watching[keyName] > 0) {
+          ret = meta.values[keyName];
+        } else {
+          ret = obj[keyName];
+        }
+
         if (ret === undefined &&
             'object' === typeof obj && !(keyName in obj) && 'function' === typeof obj.unknownProperty) {
           return obj.unknownProperty(keyName);
@@ -17933,18 +16743,13 @@ enifed("ember-metal/property_get",
       @return {Array} a temporary array with the normalized target/path pair.
     */
     function normalizeTuple(target, path) {
-      var hasThis  = pathHasThis(path);
-      var isGlobal = !hasThis && isGlobalPath(path);
-      var key;
+      var hasThis  = path.indexOf(HAS_THIS) === 0,
+          isGlobal = !hasThis && IS_GLOBAL_PATH.test(path),
+          key;
 
       if (!target || isGlobal) target = Ember.lookup;
       if (hasThis) path = path.slice(5);
 
-      Ember.deprecate(
-        "normalizeTuple will return '"+path+"' as a non-global. This behavior will change in the future (issue #3852)",
-        target === Ember.lookup || !target || hasThis || isGlobal || !isGlobalPath(path+'.')
-      );
-
       if (target === Ember.lookup) {
         key = path.match(FIRST_KEY)[0];
         target = get(target, key);
@@ -17963,12 +16768,10 @@ enifed("ember-metal/property_get",
       // If there is no root and path is a key name, return that
       // property from the global object.
       // E.g. get('Ember') -> Ember
-      if (root === null && !isPath(path)) {
-        return get(Ember.lookup, path);
-      }
+      if (root === null && path.indexOf('.') === -1) { return get(Ember.lookup, path); }
 
       // detect complicated paths and normalize them
-      hasThis = pathHasThis(path);
+      hasThis = path.indexOf(HAS_THIS) === 0;
 
       if (!root || hasThis) {
         tuple = normalizeTuple(root, path);
@@ -17998,19 +16801,19 @@ enifed("ember-metal/property_get",
     __exports__.normalizeTuple = normalizeTuple;
     __exports__._getPath = _getPath;
   });
-enifed("ember-metal/property_set",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_events","ember-metal/properties","ember-metal/error","ember-metal/path_cache","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+define("ember-metal/property_set",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/property_events","ember-metal/properties","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var getPath = __dependency2__._getPath;
-    var propertyWillChange = __dependency3__.propertyWillChange;
-    var propertyDidChange = __dependency3__.propertyDidChange;
-    var defineProperty = __dependency4__.defineProperty;
-    var EmberError = __dependency5__["default"];
-    var isPath = __dependency6__.isPath;
-    var hasPropertyAccessors = __dependency7__.hasPropertyAccessors;
+    var META_KEY = __dependency3__.META_KEY;
+    var propertyWillChange = __dependency4__.propertyWillChange;
+    var propertyDidChange = __dependency4__.propertyDidChange;
+    var defineProperty = __dependency5__.defineProperty;
+    var EmberError = __dependency6__["default"];
 
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
     var IS_GLOBAL = /^([A-Z$]|([0-9][A-Z$]))/;
 
     /**
@@ -18040,11 +16843,10 @@ enifed("ember-metal/property_set",
         return setPath(obj, keyName, value, tolerant);
       }
 
-      var meta = obj['__ember_meta__'];
-      var desc = meta && meta.descs[keyName];
-      var isUnknown, currentValue;
+      var meta = obj[META_KEY], desc = meta && meta.descs[keyName],
+          isUnknown, currentValue;
 
-      if (desc === undefined && isPath(keyName)) {
+      if (desc === undefined && keyName.indexOf('.') !== -1) {
         return setPath(obj, keyName, value, tolerant);
       }
 
@@ -18067,29 +16869,24 @@ enifed("ember-metal/property_set",
         if (isUnknown && 'function' === typeof obj.setUnknownProperty) {
           obj.setUnknownProperty(keyName, value);
         } else if (meta && meta.watching[keyName] > 0) {
-          
-            if (hasPropertyAccessors) {
-              currentValue = meta.values[keyName];
-            } else {
-              currentValue = obj[keyName];
-            }
-                    // only trigger a change if the value has changed
+          if (MANDATORY_SETTER) {
+            currentValue = meta.values[keyName];
+          } else {
+            currentValue = obj[keyName];
+          }
+          // only trigger a change if the value has changed
           if (value !== currentValue) {
             propertyWillChange(obj, keyName);
-            
-              if (hasPropertyAccessors) {
-                if (
-                  (currentValue === undefined && !(keyName in obj)) ||
-                  !Object.prototype.propertyIsEnumerable.call(obj, keyName)
-                ) {
-                  defineProperty(obj, keyName, null, value); // setup mandatory setter
-                } else {
-                  meta.values[keyName] = value;
-                }
+            if (MANDATORY_SETTER) {
+              if ((currentValue === undefined && !(keyName in obj)) || !obj.propertyIsEnumerable(keyName)) {
+                defineProperty(obj, keyName, null, value); // setup mandatory setter
               } else {
-                obj[keyName] = value;
+                meta.values[keyName] = value;
               }
-                        propertyDidChange(obj, keyName);
+            } else {
+              obj[keyName] = value;
+            }
+            propertyDidChange(obj, keyName);
           }
         } else {
           obj[keyName] = value;
@@ -18152,17 +16949,15 @@ enifed("ember-metal/property_set",
 
     __exports__.trySet = trySet;__exports__.set = set;
   });
-enifed("ember-metal/run_loop",
-  ["ember-metal/core","ember-metal/utils","ember-metal/array","ember-metal/property_events","backburner","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+define("ember-metal/run_loop",
+  ["ember-metal/core","ember-metal/utils","ember-metal/array","ember-metal/property_events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var apply = __dependency2__.apply;
-    var GUID_KEY = __dependency2__.GUID_KEY;
     var indexOf = __dependency3__.indexOf;
     var beginPropertyChanges = __dependency4__.beginPropertyChanges;
     var endPropertyChanges = __dependency4__.endPropertyChanges;
-    var Backburner = __dependency5__["default"];
 
     function onBegin(current) {
       run.currentRunLoop = current;
@@ -18173,8 +16968,8 @@ enifed("ember-metal/run_loop",
     }
 
     // ES6TODO: should Backburner become es6?
+    var Backburner = requireModule('backburner').Backburner;
     var backburner = new Backburner(['sync', 'actions', 'destroy'], {
-      GUID_KEY: GUID_KEY,
       sync: {
         before: beginPropertyChanges,
         after: endPropertyChanges
@@ -18221,7 +17016,7 @@ enifed("ember-metal/run_loop",
     */
     __exports__["default"] = run;
     function run() {
-      return backburner.run.apply(backburner, arguments);
+      return apply(backburner, backburner.run, arguments);
     }
 
     /**
@@ -18263,12 +17058,12 @@ enifed("ember-metal/run_loop",
     */
     run.join = function(target, method /* args */) {
       if (!run.currentRunLoop) {
-        return Ember.run.apply(Ember, arguments);
+        return apply(Ember, run, arguments);
       }
 
       var args = slice.call(arguments);
       args.unshift('actions');
-      run.schedule.apply(run, args);
+      apply(run, run.schedule, args);
     };
 
     /**
@@ -18315,7 +17110,7 @@ enifed("ember-metal/run_loop",
     run.bind = function(target, method /* args*/) {
       var args = slice.call(arguments);
       return function() {
-        return run.join.apply(run, args.concat(slice.call(arguments)));
+        return apply(run, run.join, args.concat(slice.call(arguments)));
       };
     };
 
@@ -18409,7 +17204,7 @@ enifed("ember-metal/run_loop",
     */
     run.schedule = function(queue, target, method) {
       checkAutoRun();
-      backburner.schedule.apply(backburner, arguments);
+      apply(backburner, backburner.schedule, arguments);
     };
 
     // Used by global test teardown
@@ -18446,7 +17241,7 @@ enifed("ember-metal/run_loop",
 
     /**
       Invokes the passed target/method and optional arguments after a specified
-      period of time. The last parameter of this method must always be a number
+      period if time. The last parameter of this method must always be a number
       of milliseconds.
 
       You should use this method whenever you need to run some action after a
@@ -18467,10 +17262,11 @@ enifed("ember-metal/run_loop",
         target at the time the method is invoked.
       @param {Object} [args*] Optional arguments to pass to the timeout.
       @param {Number} wait Number of milliseconds to wait.
-      @return {Object} Timer information for use in cancelling, see `run.cancel`.
+      @return {String} a string you can use to cancel the timer in
+        `run.cancel` later.
     */
-    run.later = function(/*target, method*/) {
-      return backburner.later.apply(backburner, arguments);
+    run.later = function(target, method) {
+      return apply(backburner, backburner.later, arguments);
     };
 
     /**
@@ -18536,9 +17332,9 @@ enifed("ember-metal/run_loop",
       @param {Object} [args*] Optional arguments to pass to the timeout.
       @return {Object} Timer information for use in cancelling, see `run.cancel`.
     */
-    run.scheduleOnce = function(/*queue, target, method*/) {
+    run.scheduleOnce = function(queue, target, method) {
       checkAutoRun();
-      return backburner.scheduleOnce.apply(backburner, arguments);
+      return apply(backburner, backburner.scheduleOnce, arguments);
     };
 
     /**
@@ -18717,7 +17513,7 @@ enifed("ember-metal/run_loop",
       @return {Array} Timer information for use in cancelling, see `run.cancel`.
     */
     run.debounce = function() {
-      return backburner.debounce.apply(backburner, arguments);
+      return apply(backburner, backburner.debounce, arguments);
     };
 
     /**
@@ -18756,7 +17552,7 @@ enifed("ember-metal/run_loop",
       @return {Array} Timer information for use in cancelling, see `run.cancel`.
     */
     run.throttle = function() {
-      return backburner.throttle.apply(backburner, arguments);
+      return apply(backburner, backburner.throttle, arguments);
     };
 
     // Make sure it's not an autorun during testing
@@ -18782,13 +17578,12 @@ enifed("ember-metal/run_loop",
       }
     };
   });
-enifed("ember-metal/set_properties",
-  ["ember-metal/property_events","ember-metal/property_set","ember-metal/keys","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+define("ember-metal/set_properties",
+  ["ember-metal/property_events","ember-metal/property_set","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var changeProperties = __dependency1__.changeProperties;
     var set = __dependency2__.set;
-    var keys = __dependency3__["default"];
 
     /**
       Set a list of properties on an object. These properties are set inside
@@ -18806,26 +17601,20 @@ enifed("ember-metal/set_properties",
       ```
 
       @method setProperties
-      @param obj
-      @param {Object} properties
-      @return obj
+      @param self
+      @param {Object} hash
+      @return self
     */
-    __exports__["default"] = function setProperties(obj, properties) {
-      if (!properties || typeof properties !== "object") { return obj; }
+    __exports__["default"] = function setProperties(self, hash) {
       changeProperties(function() {
-        var props = keys(properties);
-        var propertyName;
-
-        for (var i = 0, l = props.length; i < l; i++) {
-          propertyName = props[i];
-
-          set(obj, propertyName, properties[propertyName]);
+        for(var prop in hash) {
+          if (hash.hasOwnProperty(prop)) { set(self, prop, hash[prop]); }
         }
       });
-      return obj;
+      return self;
     }
   });
-enifed("ember-metal/utils",
+define("ember-metal/utils",
   ["ember-metal/core","ember-metal/platform","ember-metal/array","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
         // Remove "use strict"; from transpiled module until
@@ -18834,9 +17623,7 @@ enifed("ember-metal/utils",
     // REMOVE_USE_STRICT: true
 
     var Ember = __dependency1__["default"];
-    var o_defineProperty = __dependency2__.defineProperty;
-    var canDefineNonEnumerableProperties = __dependency2__.canDefineNonEnumerableProperties;
-    var hasPropertyAccessors = __dependency2__.hasPropertyAccessors;
+    var platform = __dependency2__.platform;
     var create = __dependency2__.create;
 
     var forEach = __dependency3__.forEach;
@@ -18877,58 +17664,12 @@ enifed("ember-metal/utils",
     */
     var GUID_PREFIX = 'ember';
 
+    var o_defineProperty = platform.defineProperty;
     var o_create = create;
     // Used for guid generation...
     var numberCache  = [];
     var stringCache  = {};
-
-    /**
-      Strongly hint runtimes to intern the provided string.
-
-      When do I need to use this function?
-
-      For the most part, never. Pre-mature optimization is bad, and often the
-      runtime does exactly what you need it to, and more often the trade-off isn't
-      worth it.
-
-      Why?
-
-      Runtimes store strings in at least 2 different representations:
-      Ropes and Symbols (interned strings). The Rope provides a memory efficient
-      data-structure for strings created from concatenation or some other string
-      manipulation like splitting.
-
-      Unfortunately checking equality of different ropes can be quite costly as
-      runtimes must resort to clever string comparison algorithims. These
-      algorithims typically cost in proportion to the length of the string.
-      Luckily, this is where the Symbols (interned strings) shine. As Symbols are
-      unique by their string content, equality checks can be done by pointer
-      comparision.
-
-      How do I know if my string is a rope or symbol?
-
-      Typically (warning general sweeping statement, but truthy in runtimes at
-      present) static strings created as part of the JS source are interned.
-      Strings often used for comparisions can be interned at runtime if some
-      criteria are met.  One of these criteria can be the size of the entire rope.
-      For example, in chrome 38 a rope longer then 12 characters will not
-      intern, nor will segments of that rope.
-
-      Some numbers: http://jsperf.com/eval-vs-keys/8
-
-      Known Trick™
-
-      @private
-      @return {String} interned version of the provided string
-    */
-    function intern(str) {
-      var obj = {};
-      obj[str] = 1;
-      for (var key in obj) {
-        if (key === str) return key;
-      }
-      return str;
-    }
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
 
     /**
       A unique key used to assign guids and other private metadata to objects.
@@ -18944,7 +17685,7 @@ enifed("ember-metal/utils",
       @type String
       @final
     */
-    var GUID_KEY = intern('__ember' + (+ new Date()));
+    var GUID_KEY = '__ember' + (+ new Date());
 
     var GUID_DESC = {
       writable:    false,
@@ -19026,7 +17767,7 @@ enifed("ember-metal/utils",
           if (obj[GUID_KEY]) return obj[GUID_KEY];
           if (obj === Object) return '(Object)';
           if (obj === Array)  return '(Array)';
-          ret = GUID_PREFIX + uuid();
+          ret = 'ember' + uuid();
 
           if (obj[GUID_KEY] === null) {
             obj[GUID_KEY] = ret;
@@ -19049,6 +17790,19 @@ enifed("ember-metal/utils",
       value: null
     };
 
+    /**
+      The key used to store meta information on object for property observing.
+
+      @property META_KEY
+      @for Ember
+      @private
+      @final
+      @type String
+    */
+    var META_KEY = '__ember_meta__';
+
+    var isDefinePropertySimulated = platform.defineProperty.isSimulated;
+
     function Meta(obj) {
       this.descs = {};
       this.watching = {};
@@ -19073,7 +17827,7 @@ enifed("ember-metal/utils",
       proto: null
     };
 
-    if (!canDefineNonEnumerableProperties) {
+    if (isDefinePropertySimulated) {
       // on platforms that don't support enumerable false
       // make meta fail jQuery.isPlainObject() to hide from
       // jQuery.extend() by having a property that fails
@@ -19088,11 +17842,7 @@ enifed("ember-metal/utils",
     // Placeholder for non-writable metas.
     var EMPTY_META = new Meta(null);
 
-    
-      if (hasPropertyAccessors) {
-        EMPTY_META.values = {};
-      }
-    
+    if (MANDATORY_SETTER) { EMPTY_META.values = {}; }
 
     /**
       Retrieves the meta hash for an object. If `writable` is true ensures the
@@ -19114,27 +17864,23 @@ enifed("ember-metal/utils",
     */
     function meta(obj, writable) {
 
-      var ret = obj['__ember_meta__'];
+      var ret = obj[META_KEY];
       if (writable===false) return ret || EMPTY_META;
 
       if (!ret) {
-        if (canDefineNonEnumerableProperties) o_defineProperty(obj, '__ember_meta__', META_DESC);
+        if (!isDefinePropertySimulated) o_defineProperty(obj, META_KEY, META_DESC);
 
         ret = new Meta(obj);
 
-        
-          if (hasPropertyAccessors) {
-            ret.values = {};
-          }
-        
+        if (MANDATORY_SETTER) { ret.values = {}; }
 
-        obj['__ember_meta__'] = ret;
+        obj[META_KEY] = ret;
 
         // make sure we don't accidentally try to create constructor like desc
         ret.descs.constructor = null;
 
       } else if (ret.source !== obj) {
-        if (canDefineNonEnumerableProperties) o_defineProperty(obj, '__ember_meta__', META_DESC);
+        if (!isDefinePropertySimulated) o_defineProperty(obj, META_KEY, META_DESC);
 
         ret = o_create(ret);
         ret.descs     = o_create(ret.descs);
@@ -19143,13 +17889,9 @@ enifed("ember-metal/utils",
         ret.cacheMeta = {};
         ret.source    = obj;
 
-        
-          if (hasPropertyAccessors) {
-            ret.values = o_create(ret.values);
-          }
-        
+        if (MANDATORY_SETTER) { ret.values = o_create(ret.values); }
 
-        obj['__ember_meta__'] = ret;
+        obj[META_KEY] = ret;
       }
       return ret;
     }
@@ -19200,8 +17942,7 @@ enifed("ember-metal/utils",
     */
     function metaPath(obj, path, writable) {
       Ember.deprecate("Ember.metaPath is deprecated and will be removed from future releases.");
-      var _meta = meta(obj, writable);
-      var keyName, value;
+      var _meta = meta(obj, writable), keyName, value;
 
       for (var i=0, l=path.length; i<l; i++) {
         keyName = path[i];
@@ -19236,14 +17977,9 @@ enifed("ember-metal/utils",
     */
     function wrap(func, superFunc) {
       function superWrapper() {
-        var ret;
-        var sup  = this && this.__nextSuper;
-        var args = new Array(arguments.length);
-        for (var i = 0, l = args.length; i < l; i++) {
-          args[i] = arguments[i];
-        }
+        var ret, sup = this && this.__nextSuper;
         if(this) { this.__nextSuper = superFunc; }
-        ret = apply(this, func, args);
+        ret = apply(this, func, arguments);
         if(this) { this.__nextSuper = sup; }
         return ret;
       }
@@ -19646,19 +18382,13 @@ enifed("ember-metal/utils",
         return obj + '';
       }
 
-      var v;
-      var ret = [];
+      var v, ret = [];
       for(var key in obj) {
         if (obj.hasOwnProperty(key)) {
           v = obj[key];
           if (v === 'toString') { continue; } // ignore useless items
           if (typeOf(v) === 'function') { v = "function() { ... }"; }
-
-          if (v && typeof v.toString !== 'function') {
-            ret.push(key + ": " + toString.call(v));
-          } else {
-            ret.push(key + ": " + v);
-          }
+          ret.push(key + ": " + v);
         }
       }
       return "{" + ret.join(", ") + "}";
@@ -19694,8 +18424,10 @@ enifed("ember-metal/utils",
     }
 
     __exports__.applyStr = applyStr;__exports__.GUID_KEY = GUID_KEY;
+    __exports__.GUID_PREFIX = GUID_PREFIX;
     __exports__.META_DESC = META_DESC;
     __exports__.EMPTY_META = EMPTY_META;
+    __exports__.META_KEY = META_KEY;
     __exports__.meta = meta;
     __exports__.typeOf = typeOf;
     __exports__.tryCatchFinally = tryCatchFinally;
@@ -19703,20 +18435,18 @@ enifed("ember-metal/utils",
     __exports__.canInvoke = canInvoke;
     __exports__.tryFinally = tryFinally;
   });
-enifed("ember-metal/watch_key",
-  ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/properties","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+define("ember-metal/watch_key",
+  ["ember-metal/core","ember-metal/utils","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var meta = __dependency2__.meta;
     var typeOf = __dependency2__.typeOf;
-    var o_defineProperty = __dependency3__.defineProperty;
-    var hasPropertyAccessors = __dependency3__.hasPropertyAccessors;
-    var MANDATORY_SETTER_FUNCTION = __dependency4__.MANDATORY_SETTER_FUNCTION;
-    var DEFAULT_GETTER_FUNCTION = __dependency4__.DEFAULT_GETTER_FUNCTION;
+    var platform = __dependency3__.platform;
 
     var metaFor = meta; // utils.js
-
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
+    var o_defineProperty = platform.defineProperty;
 
     function watchKey(obj, keyName, meta) {
       // can't watch length on Array - it is special...
@@ -19735,33 +18465,21 @@ enifed("ember-metal/watch_key",
           obj.willWatchProperty(keyName);
         }
 
-        
-          if (hasPropertyAccessors) {
-            handleMandatorySetter(m, obj, keyName);
-          }
-        
+        if (MANDATORY_SETTER && keyName in obj) {
+          m.values[keyName] = obj[keyName];
+          o_defineProperty(obj, keyName, {
+            configurable: true,
+            enumerable: obj.propertyIsEnumerable(keyName),
+            set: Ember.MANDATORY_SETTER_FUNCTION,
+            get: Ember.DEFAULT_GETTER_FUNCTION(keyName)
+          });
+        }
       } else {
         watching[keyName] = (watching[keyName] || 0) + 1;
       }
     }
 
-    __exports__.watchKey = watchKey;
-    
-      var handleMandatorySetter = function handleMandatorySetter(m, obj, keyName) {
-        // this x in Y deopts, so keeping it in this function is better;
-        if (keyName in obj) {
-          m.values[keyName] = obj[keyName];
-          o_defineProperty(obj, keyName, {
-            configurable: true,
-            enumerable: Object.prototype.propertyIsEnumerable.call(obj, keyName),
-            set: MANDATORY_SETTER_FUNCTION(keyName),
-            get: DEFAULT_GETTER_FUNCTION(keyName)
-          });
-        }
-      };
-    
-
-    function unwatchKey(obj, keyName, meta) {
+    __exports__.watchKey = watchKey;function unwatchKey(obj, keyName, meta) {
       var m = meta || metaFor(obj), watching = m.watching;
 
       if (watching[keyName] === 1) {
@@ -19774,25 +18492,23 @@ enifed("ember-metal/watch_key",
           obj.didUnwatchProperty(keyName);
         }
 
-        
-          if (hasPropertyAccessors && keyName in obj) {
-            o_defineProperty(obj, keyName, {
-              configurable: true,
-              enumerable: Object.prototype.propertyIsEnumerable.call(obj, keyName),
-              set: function(val) {
-                // redefine to set as enumerable
-                o_defineProperty(obj, keyName, {
-                  configurable: true,
-                  writable: true,
-                  enumerable: true,
-                  value: val
-                });
-                delete m.values[keyName];
-              },
-              get: DEFAULT_GETTER_FUNCTION(keyName)
-            });
-          }
-        
+        if (MANDATORY_SETTER && keyName in obj) {
+          o_defineProperty(obj, keyName, {
+            configurable: true,
+            enumerable: obj.propertyIsEnumerable(keyName),
+            set: function(val) {
+              // redefine to set as enumerable
+              o_defineProperty(obj, keyName, {
+                configurable: true,
+                writable: true,
+                enumerable: true,
+                value: val
+              });
+              delete m.values[keyName];
+            },
+            get: Ember.DEFAULT_GETTER_FUNCTION(keyName)
+          });
+        }
       } else if (watching[keyName] > 1) {
         watching[keyName]--;
       }
@@ -19800,7 +18516,7 @@ enifed("ember-metal/watch_key",
 
     __exports__.unwatchKey = unwatchKey;
   });
-enifed("ember-metal/watch_path",
+define("ember-metal/watch_path",
   ["ember-metal/utils","ember-metal/chains","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -19814,8 +18530,7 @@ enifed("ember-metal/watch_path",
     // chains inherited from the proto they will be cloned and reconfigured for
     // the current object.
     function chainsFor(obj, meta) {
-      var m = meta || metaFor(obj);
-      var ret = m.chains;
+      var m = meta || metaFor(obj), ret = m.chains;
       if (!ret) {
         ret = m.chains = new ChainNode(null, null, obj);
       } else if (ret.value() !== obj) {
@@ -19828,8 +18543,7 @@ enifed("ember-metal/watch_path",
       // can't watch length on Array - it is special...
       if (keyPath === 'length' && typeOf(obj) === 'array') { return; }
 
-      var m = meta || metaFor(obj);
-      var watching = m.watching;
+      var m = meta || metaFor(obj), watching = m.watching;
 
       if (!watching[keyPath]) { // activate watching first time
         watching[keyPath] = 1;
@@ -19840,8 +18554,7 @@ enifed("ember-metal/watch_path",
     }
 
     __exports__.watchPath = watchPath;function unwatchPath(obj, keyPath, meta) {
-      var m = meta || metaFor(obj);
-      var watching = m.watching;
+      var m = meta || metaFor(obj), watching = m.watching;
 
       if (watching[keyPath] === 1) {
         watching[keyPath] = 0;
@@ -19853,15 +18566,16 @@ enifed("ember-metal/watch_path",
 
     __exports__.unwatchPath = unwatchPath;
   });
-enifed("ember-metal/watching",
-  ["ember-metal/utils","ember-metal/chains","ember-metal/watch_key","ember-metal/watch_path","ember-metal/path_cache","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+define("ember-metal/watching",
+  ["ember-metal/utils","ember-metal/chains","ember-metal/watch_key","ember-metal/watch_path","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
     @module ember-metal
     */
 
     var meta = __dependency1__.meta;
+    var META_KEY = __dependency1__.META_KEY;
     var GUID_KEY = __dependency1__.GUID_KEY;
     var typeOf = __dependency1__.typeOf;
     var generateGuid = __dependency1__.generateGuid;
@@ -19873,7 +18587,11 @@ enifed("ember-metal/watching",
     var unwatchPath = __dependency4__.unwatchPath;
 
     var metaFor = meta; // utils.js
-    var isPath = __dependency5__.isPath;
+
+    // returns true if the passed path is just a keyName
+    function isKeyName(path) {
+      return path.indexOf('.') === -1;
+    }
 
     /**
       Starts watching a property on an object. Whenever the property changes,
@@ -19892,7 +18610,7 @@ enifed("ember-metal/watching",
       // can't watch length on Array - it is special...
       if (_keyPath === 'length' && typeOf(obj) === 'array') { return; }
 
-      if (!isPath(_keyPath)) {
+      if (isKeyName(_keyPath)) {
         watchKey(obj, _keyPath, m);
       } else {
         watchPath(obj, _keyPath, m);
@@ -19902,7 +18620,7 @@ enifed("ember-metal/watching",
     __exports__.watch = watch;
 
     function isWatching(obj, key) {
-      var meta = obj['__ember_meta__'];
+      var meta = obj[META_KEY];
       return (meta && meta.watching[key]) > 0;
     }
 
@@ -19912,7 +18630,7 @@ enifed("ember-metal/watching",
       // can't watch length on Array - it is special...
       if (_keyPath === 'length' && typeOf(obj) === 'array') { return; }
 
-      if (!isPath(_keyPath)) {
+      if (isKeyName(_keyPath)) {
         unwatchKey(obj, _keyPath, m);
       } else {
         unwatchPath(obj, _keyPath, m);
@@ -19930,7 +18648,7 @@ enifed("ember-metal/watching",
       @param obj
     */
     function rewatch(obj) {
-      var m = obj['__ember_meta__'], chains = m && m.chains;
+      var m = obj[META_KEY], chains = m && m.chains;
 
       // make sure the object has its own guid.
       if (GUID_KEY in obj && !obj.hasOwnProperty(GUID_KEY)) {
@@ -19955,9 +18673,9 @@ enifed("ember-metal/watching",
       @return {void}
     */
     function destroy(obj) {
-      var meta = obj['__ember_meta__'], node, nodes, key, nodeObject;
+      var meta = obj[META_KEY], node, nodes, key, nodeObject;
       if (meta) {
-        obj['__ember_meta__'] = null;
+        obj[META_KEY] = null;
         // remove chainWatchers to remove circular references that would prevent GC
         node = meta.chains;
         if (node) {
@@ -19988,7 +18706,7 @@ enifed("ember-metal/watching",
 
     __exports__.destroy = destroy;
   });
-enifed("ember-routing-handlebars",
+define("ember-routing-handlebars",
   ["ember-metal/core","ember-handlebars","ember-routing/system/router","ember-routing-handlebars/helpers/shared","ember-routing-handlebars/helpers/link_to","ember-routing-handlebars/helpers/outlet","ember-routing-handlebars/helpers/render","ember-routing-handlebars/helpers/action","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -20010,7 +18728,6 @@ enifed("ember-routing-handlebars",
     var deprecatedLinkToHelper = __dependency5__.deprecatedLinkToHelper;
     var linkToHelper = __dependency5__.linkToHelper;
     var LinkView = __dependency5__.LinkView;
-    var queryParamsHelper = __dependency5__.queryParamsHelper;
 
     var outletHelper = __dependency6__.outletHelper;
     var OutletView = __dependency6__.OutletView;
@@ -20032,13 +18749,12 @@ enifed("ember-routing-handlebars",
     EmberHandlebars.registerHelper('outlet', outletHelper);
     EmberHandlebars.registerHelper('link-to', linkToHelper);
     EmberHandlebars.registerHelper('linkTo', deprecatedLinkToHelper);
-    EmberHandlebars.registerHelper('query-params', queryParamsHelper);
 
     __exports__["default"] = Ember;
   });
-enifed("ember-routing-handlebars/helpers/action",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/utils","ember-metal/run_loop","ember-views/system/utils","ember-views/system/action_manager","ember-routing/system/router","ember-handlebars","ember-handlebars/ext","ember-handlebars/helpers/view","ember-routing-handlebars/helpers/shared","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+define("ember-routing-handlebars/helpers/action",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/utils","ember-metal/run_loop","ember-views/system/utils","ember-routing/system/router","ember-handlebars","ember-handlebars/ext","ember-handlebars/helpers/view","ember-routing-handlebars/helpers/shared","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Handlebars, uuid, FEATURES, assert, deprecate
@@ -20048,14 +18764,13 @@ enifed("ember-routing-handlebars/helpers/action",
     var run = __dependency5__["default"];
 
     var isSimpleClick = __dependency6__.isSimpleClick;
-    var ActionManager = __dependency7__["default"];
-    var EmberRouter = __dependency8__["default"];
+    var EmberRouter = __dependency7__["default"];
 
-    var EmberHandlebars = __dependency9__["default"];
-    var handlebarsGet = __dependency10__.handlebarsGet;
-    var viewHelper = __dependency11__.viewHelper;
-    var resolveParams = __dependency12__.resolveParams;
-    var resolvePath = __dependency12__.resolvePath;
+    var EmberHandlebars = __dependency8__["default"];
+    var handlebarsGet = __dependency9__.handlebarsGet;
+    var viewHelper = __dependency10__.viewHelper;
+    var resolveParams = __dependency11__.resolveParams;
+    var resolvePath = __dependency11__.resolvePath;
 
     /**
     @module ember
@@ -20069,17 +18784,15 @@ enifed("ember-routing-handlebars/helpers/action",
       var ret = [];
       if (actionName) { ret.push(actionName); }
 
-      var types = options.options.types.slice(1);
-      var data = options.options.data;
+      var types = options.options.types.slice(1),
+          data = options.options.data;
 
       return ret.concat(resolveParams(options.context, options.params, { types: types, data: data }));
     }
 
-    var ActionHelper = {};
-
-    // registeredActions is re-exported for compatibility with older plugins
-    // that were using this undocumented API.
-    ActionHelper.registeredActions = ActionManager.registeredActions;
+    var ActionHelper = {
+      registeredActions: {}
+    };
 
     __exports__.ActionHelper = ActionHelper;
 
@@ -20111,20 +18824,10 @@ enifed("ember-routing-handlebars/helpers/action",
       return allowed;
     };
 
-    function isKeyEvent(eventName) {
-      return ['keyUp', 'keyPress', 'keyDown'].indexOf(eventName) !== -1;
-    }
-
-    function ignoreKeyEvent(eventName, event, keyCode) {
-      var any = 'any';
-      keyCode = keyCode || any;
-      return isKeyEvent(eventName) && keyCode !== any && keyCode !== event.which.toString();
-    }
-
     ActionHelper.registerAction = function(actionNameOrPath, options, allowedKeys) {
       var actionId = uuid();
 
-      ActionManager.registeredActions[actionId] = {
+      ActionHelper.registeredActions[actionId] = {
         eventName: options.eventName,
         handler: function handleRegisteredAction(event) {
           if (!isAllowedEvent(event, allowedKeys)) { return true; }
@@ -20137,12 +18840,10 @@ enifed("ember-routing-handlebars/helpers/action",
             event.stopPropagation();
           }
 
-          var target = options.target;
-          var parameters = options.parameters;
-          var eventName = options.eventName;
-          var actionName;
+          var target = options.target,
+              parameters = options.parameters,
+              actionName;
 
-          
           if (target.target) {
             target = handlebarsGet(target.root, target.target, target.options);
           } else {
@@ -20174,25 +18875,24 @@ enifed("ember-routing-handlebars/helpers/action",
       };
 
       options.view.on('willClearRender', function() {
-        delete ActionManager.registeredActions[actionId];
+        delete ActionHelper.registeredActions[actionId];
       });
 
       return actionId;
     };
 
     /**
+      The `{{action}}` helper registers an HTML element within a template for DOM
+      event handling and forwards that interaction to the templates's controller
+      or supplied `target` option (see 'Specifying a Target').
 
-      The `{{action}}` helper provides a useful shortcut for registering an HTML
-      element within a template for a single DOM event and forwarding that
-      interaction to the template's controller or specified `target` option.
-
-      If the controller does not implement the specified action, the event is sent
+      If the controller does not implement the event, the event is sent
       to the current route, and it bubbles up the route hierarchy from there.
 
-      For more advanced event handling see [Ember.Component](/api/classes/Ember.Component.html)
+      User interaction with that element will invoke the supplied action name on
+      the appropriate target. Specifying a non-quoted action name will result in
+      a bound property lookup at the time the event will be triggered.
 
-
-      ### Use
       Given the following application Handlebars template on the page
 
       ```handlebars
@@ -20272,6 +18972,12 @@ enifed("ember-routing-handlebars/helpers/action",
       See `Ember.View` 'Responding to Browser Events' for a list of
       acceptable DOM event names.
 
+      NOTE: Because `{{action}}` depends on Ember's event dispatch system it will
+      only function if an `Ember.EventDispatcher` instance is available. An
+      `Ember.EventDispatcher` instance will be created when a new `Ember.Application`
+      is created. Having an instance of `Ember.Application` will satisfy this
+      requirement.
+
       ### Specifying whitelisted modifier keys
 
       By default the `{{action}}` helper will ignore click event with pressed modifier
@@ -20297,7 +19003,7 @@ enifed("ember-routing-handlebars/helpers/action",
 
       There are several possible target objects for `{{action}}` helpers:
 
-      In a typical Ember application, where templates are managed through use of the
+      In a typical Ember application, where views are managed through use of the
       `{{outlet}}` helper, actions will bubble to the current controller, then
       to the current route, and then up the route hierarchy.
 
@@ -20345,10 +19051,11 @@ enifed("ember-routing-handlebars/helpers/action",
       @param {Hash} options
     */
     function actionHelper(actionName) {
-      var options = arguments[arguments.length - 1];
-      var contexts = a_slice.call(arguments, 1, -1);
-      var hash = options.hash;
-      var controller = options.data.keywords.controller;
+      var options = arguments[arguments.length - 1],
+          contexts = a_slice.call(arguments, 1, -1);
+
+      var hash = options.hash,
+          controller = options.data.keywords.controller;
 
       // create a hash to pass along to registerAction
       var action = {
@@ -20362,7 +19069,6 @@ enifed("ember-routing-handlebars/helpers/action",
         bubbles: hash.bubbles,
         preventDefault: hash.preventDefault,
         target: { options: options },
-        withKeyCode: hash.withKeyCode,
         boundProperty: options.types[0] === "ID"
       };
 
@@ -20379,8 +19085,8 @@ enifed("ember-routing-handlebars/helpers/action",
 
     __exports__.actionHelper = actionHelper;
   });
-enifed("ember-routing-handlebars/helpers/link_to",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-runtime/system/lazy_load","ember-runtime/system/string","ember-runtime/system/object","ember-metal/keys","ember-views/system/utils","ember-views/views/component","ember-handlebars","ember-handlebars/helpers/view","ember-routing/system/router","ember-routing-handlebars/helpers/shared","exports"],
+define("ember-routing-handlebars/helpers/link_to",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-runtime/system/lazy_load","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/keys","ember-views/system/utils","ember-views/views/component","ember-handlebars","ember-handlebars/helpers/view","ember-routing/system/router","ember-routing-handlebars/helpers/shared","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -20430,8 +19136,8 @@ enifed("ember-routing-handlebars/helpers/link_to",
 
     function getResolvedPaths(options) {
 
-      var types = options.options.types;
-      var data = options.options.data;
+      var types = options.options.types,
+          data = options.options.data;
 
       return resolvePaths(options.context, options.params, { types: types, data: data });
     }
@@ -20452,20 +19158,8 @@ enifed("ember-routing-handlebars/helpers/link_to",
     **/
     var LinkView = Ember.LinkView = EmberComponent.extend({
       tagName: 'a',
-
-      /**
-        @deprecated Use current-when instead.
-        @property currentWhen
-      */
       currentWhen: null,
 
-      /**
-        Used to determine when this LinkView is active.
-
-        @property currentWhen
-      */
-      'current-when': null,
-
       /**
         Sets the `title` attribute of the `LinkView`'s HTML element.
 
@@ -20595,8 +19289,6 @@ enifed("ember-routing-handlebars/helpers/link_to",
       init: function() {
         this._super.apply(this, arguments);
 
-        Ember.deprecate('Using currentWhen with {{link-to}} is deprecated in favor of `current-when`.', !this.currentWhen);
-
         // Map desired event name to invoke function
         var eventName = get(this, 'eventName');
         this.on(eventName, this, this._invoke);
@@ -20622,11 +19314,11 @@ enifed("ember-routing-handlebars/helpers/link_to",
        @since 1.3.0
       **/
       _setupPathObservers: function(){
-        var helperParameters = this.parameters;
-        var linkTextPath = helperParameters.options.linkTextPath;
-        var paths = getResolvedPaths(helperParameters);
-        var length = paths.length;
-        var path, i, normalizedPath;
+        var helperParameters = this.parameters,
+            linkTextPath     = helperParameters.options.linkTextPath,
+            paths = getResolvedPaths(helperParameters),
+            length = paths.length,
+            path, i, normalizedPath;
 
         if (linkTextPath) {
           normalizedPath = getNormalizedPath(linkTextPath, helperParameters);
@@ -20688,9 +19380,6 @@ enifed("ember-routing-handlebars/helpers/link_to",
         or the application's current route is the route the `LinkView` would trigger
         transitions into.
 
-        The `currentWhen` property can match against multiple routes by separating
-        route names using the ` ` (space) character.
-
         @property active
       **/
       active: computed('loadedParams', function computeLinkViewActive() {
@@ -20699,33 +19388,33 @@ enifed("ember-routing-handlebars/helpers/link_to",
         var router = get(this, 'router');
         var loadedParams = get(this, 'loadedParams');
         var contexts = loadedParams.models;
-        var currentWhen = this['current-when'] || this.currentWhen;
+        var currentWhen = this.currentWhen;
         var isCurrentWhenSpecified = Boolean(currentWhen);
         currentWhen = currentWhen || loadedParams.targetRouteName;
 
-        function isActiveForRoute(routeName) {
-          var handlers = router.router.recognizer.handlersFor(routeName);
-          var leafName = handlers[handlers.length-1].handler;
-          var maximumContexts = numberOfContextsAcceptedByHandler(routeName, handlers);
+        var handlers = router.router.recognizer.handlersFor(currentWhen);
+        var leafName = handlers[handlers.length-1].handler;
+        var maximumContexts = numberOfContextsAcceptedByHandler(currentWhen, handlers);
 
-          // NOTE: any ugliness in the calculation of activeness is largely
-          // due to the fact that we support automatic normalizing of
-          // `resource` -> `resource.index`, even though there might be
-          // dynamic segments / query params defined on `resource.index`
-          // which complicates (and makes somewhat ambiguous) the calculation
-          // of activeness for links that link to `resource` instead of
-          // directly to `resource.index`.
+        // NOTE: any ugliness in the calculation of activeness is largely
+        // due to the fact that we support automatic normalizing of
+        // `resource` -> `resource.index`, even though there might be
+        // dynamic segments / query params defined on `resource.index`
+        // which complicates (and makes somewhat ambiguous) the calculation
+        // of activeness for links that link to `resource` instead of
+        // directly to `resource.index`.
 
-          // if we don't have enough contexts revert back to full route name
-          // this is because the leaf route will use one of the contexts
-          if (contexts.length > maximumContexts) {
-            routeName = leafName;
-          }
+        // if we don't have enough contexts revert back to full route name
+        // this is because the leaf route will use one of the contexts
+        if (contexts.length > maximumContexts) {
+          currentWhen = leafName;
+        }
 
-          var args = routeArgs(routeName, contexts, null);
-          var isActive = router.isActive.apply(router, args);
-          if (!isActive) { return false; }
+        var args = routeArgs(currentWhen, contexts, null);
+        var isActive = router.isActive.apply(router, args);
+        if (!isActive) { return false; }
 
+        
           var emptyQueryParams = Ember.isEmpty(Ember.keys(loadedParams.queryParams));
 
           if (!isCurrentWhenSpecified && !emptyQueryParams && isActive) {
@@ -20734,18 +19423,10 @@ enifed("ember-routing-handlebars/helpers/link_to",
             router._prepareQueryParams(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
             isActive = shallowEqual(visibleQueryParams, router.router.state.queryParams);
           }
-
-          return isActive;
-        }
-
         
-          currentWhen = currentWhen.split(' ');
-          for (var i = 0, len = currentWhen.length; i < len; i++) {
-            if (isActiveForRoute(currentWhen[i])) {
-              return get(this, 'activeClass');
-            }
-          }
-              }),
+
+        if (isActive) { return get(this, 'activeClass'); }
+      }),
 
       /**
         Accessed as a classname binding to apply the `LinkView`'s `loadingClass`
@@ -20787,11 +19468,9 @@ enifed("ember-routing-handlebars/helpers/link_to",
 
         if (this.preventDefault !== false) {
           
-            var targetAttribute = get(this, 'target');
-            if (!targetAttribute || targetAttribute === '_self') {
-              event.preventDefault();
-            }
-                  }
+            event.preventDefault();
+          
+        }
 
         if (this.bubbles === false) { event.stopPropagation(); }
 
@@ -20802,15 +19481,8 @@ enifed("ember-routing-handlebars/helpers/link_to",
           return false;
         }
 
-        
-          var targetAttribute2 = get(this, 'target');
-          if (targetAttribute2 && targetAttribute2 !== '_self') {
-            return false;
-          }
-        
-
-        var router = get(this, 'router');
-        var loadedParams = get(this, 'loadedParams');
+        var router = get(this, 'router'),
+            loadedParams = get(this, 'loadedParams');
 
         var transition = router._doTransition(loadedParams.targetRouteName, loadedParams.models, loadedParams.queryParams);
         if (get(this, 'replace')) {
@@ -20878,13 +19550,13 @@ enifed("ember-routing-handlebars/helpers/link_to",
         @return {Array}
        */
       resolvedParams: computed('router.url', function() {
-        var parameters = this.parameters;
-        var options = parameters.options;
-        var types = options.types;
-        var data = options.data;
-        var targetRouteName, models;
-        var onlyQueryParamsSupplied = (parameters.params.length === 0);
+        var parameters = this.parameters,
+            options = parameters.options,
+            types = options.types,
+            data = options.data,
+            targetRouteName, models;
 
+        var onlyQueryParamsSupplied = (parameters.params.length === 0);
         if (onlyQueryParamsSupplied) {
           var appController = this.container.lookup('controller:application');
           targetRouteName = get(appController, 'currentRouteName');
@@ -20917,8 +19589,8 @@ enifed("ember-routing-handlebars/helpers/link_to",
         var router = get(this, 'router');
         if (!router) { return; }
 
-        var resolvedParams = get(this, 'resolvedParams');
-        var namedRoute = resolvedParams.targetRouteName;
+        var resolvedParams = get(this, 'resolvedParams'),
+            namedRoute = resolvedParams.targetRouteName;
 
         if (!namedRoute) { return; }
 
@@ -20946,16 +19618,18 @@ enifed("ember-routing-handlebars/helpers/link_to",
       href: computed('loadedParams', function computeLinkViewHref() {
         if (get(this, 'tagName') !== 'a') { return; }
 
-        var router = get(this, 'router');
-        var loadedParams = get(this, 'loadedParams');
+        var router = get(this, 'router'),
+            loadedParams = get(this, 'loadedParams');
 
         if (!loadedParams) {
           return get(this, 'loadingHref');
         }
 
         var visibleQueryParams = {};
-        merge(visibleQueryParams, loadedParams.queryParams);
-        router._prepareQueryParams(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
+        
+          merge(visibleQueryParams, loadedParams.queryParams);
+          router._prepareQueryParams(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
+        
 
         var args = routeArgs(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
         var result = router.generate.apply(router, args);
@@ -20976,19 +19650,6 @@ enifed("ember-routing-handlebars/helpers/link_to",
     LinkView.toString = function() { return "LinkView"; };
 
     
-      LinkView.reopen({
-        attributeBindings: ['target'],
-
-        /**
-          Sets the `target` attribute of the `LinkView`'s anchor element.
-
-          @property target
-          @default null
-        **/
-        target: null
-      });
-    
-
     /**
       The `{{link-to}}` helper renders a link to the supplied
       `routeName` passing an optionally supplied model to the
@@ -21252,9 +19913,9 @@ enifed("ember-routing-handlebars/helpers/link_to",
       @see {Ember.LinkView}
     */
     function linkToHelper(name) {
-      var options = slice.call(arguments, -1)[0];
-      var params = slice.call(arguments, 0, -1);
-      var hash = options.hash;
+      var options = slice.call(arguments, -1)[0],
+          params = slice.call(arguments, 0, -1),
+          hash = options.hash;
 
       Ember.assert("You must provide one or more parameters to the link-to helper.", params.length);
 
@@ -21291,22 +19952,19 @@ enifed("ember-routing-handlebars/helpers/link_to",
       return viewHelper.call(this, LinkView, options);
     }
 
-    /**
-      @method query-params
-      @for Ember.Handlebars.helpers
-      @param {Object} hash takes a hash of query parameters
-      @return {String} HTML string
-    */
-    function queryParamsHelper(options) {
-      Ember.assert(fmt("The `query-params` helper only accepts hash parameters, e.g. (query-params queryParamPropertyName='%@') as opposed to just (query-params '%@')", [options, options]), arguments.length === 1);
 
-      return QueryParams.create({
-        values: options.hash,
-        types: options.hashTypes
+    
+      EmberHandlebars.registerHelper('query-params', function queryParamsHelper(options) {
+        Ember.assert(fmt("The `query-params` helper only accepts hash parameters, e.g. (query-params queryParamPropertyName='%@') as opposed to just (query-params '%@')", [options, options]), arguments.length === 1);
+
+        return QueryParams.create({
+          values: options.hash,
+          types: options.hashTypes
+        });
       });
-    }
+    
 
-    __exports__.queryParamsHelper = queryParamsHelper;/**
+    /**
       See [link-to](/api/classes/Ember.Handlebars.helpers.html#method_link-to)
 
       @method linkTo
@@ -21322,9 +19980,9 @@ enifed("ember-routing-handlebars/helpers/link_to",
     }
 
     function getResolvedQueryParams(linkView, targetRouteName) {
-      var helperParameters = linkView.parameters;
-      var queryParamsObject = linkView.queryParamsObject;
-      var resolvedQueryParams = {};
+      var helperParameters = linkView.parameters,
+          queryParamsObject = linkView.queryParamsObject,
+          resolvedQueryParams = {};
 
       if (!queryParamsObject) { return resolvedQueryParams; }
       var rawParams = queryParamsObject.values;
@@ -21332,8 +19990,8 @@ enifed("ember-routing-handlebars/helpers/link_to",
       for (var key in rawParams) {
         if (!rawParams.hasOwnProperty(key)) { continue; }
 
-        var value = rawParams[key];
-        var type = queryParamsObject.types[key];
+        var value = rawParams[key],
+            type = queryParamsObject.types[key];
 
         if (type === 'ID') {
           var normalizedPath = getNormalizedPath(value, helperParameters);
@@ -21373,7 +20031,7 @@ enifed("ember-routing-handlebars/helpers/link_to",
     __exports__.deprecatedLinkToHelper = deprecatedLinkToHelper;
     __exports__.linkToHelper = linkToHelper;
   });
-enifed("ember-routing-handlebars/helpers/outlet",
+define("ember-routing-handlebars/helpers/outlet",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-views/views/container_view","ember-handlebars/views/metamorph_view","ember-handlebars/helpers/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
@@ -21501,7 +20159,7 @@ enifed("ember-routing-handlebars/helpers/outlet",
 
     __exports__.outletHelper = outletHelper;
   });
-enifed("ember-routing-handlebars/helpers/render",
+define("ember-routing-handlebars/helpers/render",
   ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-routing/system/generate_controller","ember-handlebars/ext","ember-handlebars/helpers/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -21514,7 +20172,7 @@ enifed("ember-routing-handlebars/helpers/render",
     var generateControllerFactory = __dependency6__.generateControllerFactory;
     var generateController = __dependency6__["default"];
     var handlebarsGet = __dependency7__.handlebarsGet;
-    var ViewHelper = __dependency8__.ViewHelper;
+    var viewHelper = __dependency8__.viewHelper;
 
 
     /**
@@ -21594,8 +20252,9 @@ enifed("ember-routing-handlebars/helpers/render",
     */
     __exports__["default"] = function renderHelper(name, contextString, options) {
       var length = arguments.length;
-      var contextProvided = length === 3;
-      var container, router, controller, view, context, lookupOptions;
+
+      var contextProvided = length === 3,
+          container, router, controller, view, context, lookupOptions;
 
       container = (options || contextString).data.keywords.controller.container;
       router = container.lookup('router:main');
@@ -21677,10 +20336,10 @@ enifed("ember-routing-handlebars/helpers/render",
 
       options.helperName = options.helperName || ('render "' + name + '"');
 
-      ViewHelper.instanceHelper(this, view, options);
+      viewHelper.call(this, view, options);
     }
   });
-enifed("ember-routing-handlebars/helpers/shared",
+define("ember-routing-handlebars/helpers/shared",
   ["ember-metal/property_get","ember-metal/array","ember-runtime/mixins/controller","ember-handlebars/ext","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -21749,8 +20408,8 @@ enifed("ember-routing-handlebars/helpers/shared",
     }
 
     __exports__.stashParamNames = stashParamNames;function resolvePaths(context, params, options) {
-      var resolved = handlebarsResolve(context, params, options);
-      var types = options.types;
+      var resolved = handlebarsResolve(context, params, options),
+          types = options.types;
 
       return map.call(resolved, function(object, i) {
         if (types[i] === 'ID') {
@@ -21773,7 +20432,7 @@ enifed("ember-routing-handlebars/helpers/shared",
 
     __exports__.resolvePaths = resolvePaths;
   });
-enifed("ember-routing",
+define("ember-routing",
   ["ember-handlebars","ember-metal/core","ember-routing/ext/run_loop","ember-routing/ext/controller","ember-routing/ext/view","ember-routing/location/api","ember-routing/location/none_location","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/system/generate_controller","ember-routing/system/controller_for","ember-routing/system/dsl","ember-routing/system/router","ember-routing/system/route","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
     "use strict";
@@ -21818,7 +20477,7 @@ enifed("ember-routing",
 
     __exports__["default"] = Ember;
   });
-enifed("ember-routing/ext/controller",
+define("ember-routing/ext/controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/utils","ember-metal/merge","ember-metal/enumerable_utils","ember-runtime/mixins/controller","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -21840,143 +20499,6 @@ enifed("ember-routing/ext/controller",
     */
 
     ControllerMixin.reopen({
-      concatenatedProperties: ['queryParams', '_pCacheMeta'],
-
-      init: function() {
-        this._super.apply(this, arguments);
-        listenForQueryParamChanges(this);
-      },
-
-      /**
-        @property queryParams
-        @public
-      */
-      queryParams: null,
-
-      /**
-        @property _qpDelegate
-        @private
-      */
-      _qpDelegate: null,
-
-      /**
-        @property _normalizedQueryParams
-        @private
-      */
-      _normalizedQueryParams: computed(function() {
-        var m = meta(this);
-        if (m.proto !== this) {
-          return get(m.proto, '_normalizedQueryParams');
-        }
-
-        var queryParams = get(this, 'queryParams');
-        if (queryParams._qpMap) {
-          return queryParams._qpMap;
-        }
-
-        var qpMap = queryParams._qpMap = {};
-
-        for (var i = 0, len = queryParams.length; i < len; ++i) {
-          accumulateQueryParamDescriptors(queryParams[i], qpMap);
-        }
-
-        return qpMap;
-      }),
-
-      /**
-        @property _cacheMeta
-        @private
-      */
-      _cacheMeta: computed(function() {
-        var m = meta(this);
-        if (m.proto !== this) {
-          return get(m.proto, '_cacheMeta');
-        }
-
-        var cacheMeta = {};
-        var qpMap = get(this, '_normalizedQueryParams');
-        for (var prop in qpMap) {
-          if (!qpMap.hasOwnProperty(prop)) { continue; }
-
-          var qp = qpMap[prop];
-          var scope = qp.scope;
-          var parts;
-
-          if (scope === 'controller') {
-            parts = [];
-          }
-
-          cacheMeta[prop] = {
-            parts: parts, // provided by route if 'model' scope
-            values: null, // provided by route
-            scope: scope,
-            prefix: "",
-            def: get(this, prop)
-          };
-        }
-
-        return cacheMeta;
-      }),
-
-      /**
-        @method _updateCacheParams
-        @private
-      */
-      _updateCacheParams: function(params) {
-        var cacheMeta = get(this, '_cacheMeta');
-        for (var prop in cacheMeta) {
-          if (!cacheMeta.hasOwnProperty(prop)) { continue; }
-          var propMeta = cacheMeta[prop];
-          propMeta.values = params;
-
-          var cacheKey = this._calculateCacheKey(propMeta.prefix, propMeta.parts, propMeta.values);
-          var cache = this._bucketCache;
-
-          if (cache) {
-            var value = cache.lookup(cacheKey, prop, propMeta.def);
-            set(this, prop, value);
-          }
-        }
-      },
-
-      /**
-        @method _qpChanged
-        @private
-      */
-      _qpChanged: function(controller, _prop) {
-        var prop = _prop.substr(0, _prop.length-3);
-        var cacheMeta = get(controller, '_cacheMeta');
-        var propCache = cacheMeta[prop];
-        var cacheKey = controller._calculateCacheKey(propCache.prefix || "", propCache.parts, propCache.values);
-        var value = get(controller, prop);
-
-        // 1. Update model-dep cache
-        var cache = this._bucketCache;
-        if (cache) {
-          controller._bucketCache.stash(cacheKey, prop, value);
-        }
-
-        // 2. Notify a delegate (e.g. to fire a qp transition)
-        var delegate = controller._qpDelegate;
-        if (delegate) {
-          delegate(controller, prop);
-        }
-      },
-
-      /**
-        @method _calculateCacheKey
-        @private
-      */
-      _calculateCacheKey: function(prefix, _parts, values) {
-        var parts = _parts || [], suffixes = "";
-        for (var i = 0, len = parts.length; i < len; ++i) {
-          var part = parts[i];
-          var value = get(values, part);
-          suffixes += "::" + part + ":" + value;
-        }
-        return prefix + suffixes.replace(ALL_PERIODS_REGEX, '-');
-      },
-
       /**
         Transition the application into another route. The route may
         be either a single route or route path:
@@ -22125,6 +20647,117 @@ enifed("ember-routing/ext/controller",
 
     var ALL_PERIODS_REGEX = /\./g;
 
+    
+      ControllerMixin.reopen({
+        init: function() {
+          this._super.apply(this, arguments);
+          listenForQueryParamChanges(this);
+        },
+
+        concatenatedProperties: ['queryParams', '_pCacheMeta'],
+        queryParams: null,
+
+        _qpDelegate: null,
+        _normalizedQueryParams: computed(function() {
+          var m = meta(this);
+          if (m.proto !== this) {
+            return get(m.proto, '_normalizedQueryParams');
+          }
+
+          var queryParams = get(this, 'queryParams');
+          if (queryParams._qpMap) {
+            return queryParams._qpMap;
+          }
+
+          var qpMap = queryParams._qpMap = {};
+
+          for (var i = 0, len = queryParams.length; i < len; ++i) {
+            accumulateQueryParamDescriptors(queryParams[i], qpMap);
+          }
+
+          return qpMap;
+        }),
+
+        _cacheMeta: computed(function() {
+          var m = meta(this);
+          if (m.proto !== this) {
+            return get(m.proto, '_cacheMeta');
+          }
+
+          var cacheMeta = {};
+          var qpMap = get(this, '_normalizedQueryParams');
+          for (var prop in qpMap) {
+            if (!qpMap.hasOwnProperty(prop)) { continue; }
+
+            var qp = qpMap[prop];
+            var scope = qp.scope;
+            var parts;
+
+            if (scope === 'controller') {
+              parts = [];
+            }
+
+            cacheMeta[prop] = {
+              parts: parts, // provided by route if 'model' scope
+              values: null, // provided by route
+              scope: scope,
+              prefix: "",
+              def: get(this, prop)
+            };
+          }
+
+          return cacheMeta;
+        }),
+
+        _updateCacheParams: function(params) {
+          var cacheMeta = get(this, '_cacheMeta');
+          for (var prop in cacheMeta) {
+            if (!cacheMeta.hasOwnProperty(prop)) { continue; }
+            var propMeta = cacheMeta[prop];
+            propMeta.values = params;
+
+            var cacheKey = this._calculateCacheKey(propMeta.prefix, propMeta.parts, propMeta.values);
+            var cache = this._bucketCache;
+
+            if (cache) {
+              var value = cache.lookup(cacheKey, prop, propMeta.def);
+              set(this, prop, value);
+            }
+          }
+        },
+
+        _qpChanged: function(controller, _prop) {
+          var prop = _prop.substr(0, _prop.length-3);
+          var cacheMeta = get(controller, '_cacheMeta');
+          var propCache = cacheMeta[prop];
+          var cacheKey = controller._calculateCacheKey(propCache.prefix || "", propCache.parts, propCache.values);
+          var value = get(controller, prop);
+
+          // 1. Update model-dep cache
+          var cache = this._bucketCache;
+          if (cache) {
+            controller._bucketCache.stash(cacheKey, prop, value);
+          }
+
+          // 2. Notify a delegate (e.g. to fire a qp transition)
+          var delegate = controller._qpDelegate;
+          if (delegate) {
+            delegate(controller, prop);
+          }
+        },
+
+        _calculateCacheKey: function(prefix, _parts, values) {
+          var parts = _parts || [], suffixes = "";
+          for (var i = 0, len = parts.length; i < len; ++i) {
+            var part = parts[i];
+            var value = get(values, part);
+            suffixes += "::" + part + ":" + value;
+          }
+          return prefix + suffixes.replace(ALL_PERIODS_REGEX, '-');
+        }
+      });
+    
+
     function accumulateQueryParamDescriptors(_desc, accum) {
       var desc = _desc, tmp;
       if (typeOf(desc) === 'string') {
@@ -22159,7 +20792,7 @@ enifed("ember-routing/ext/controller",
 
     __exports__["default"] = ControllerMixin;
   });
-enifed("ember-routing/ext/run_loop",
+define("ember-routing/ext/run_loop",
   ["ember-metal/run_loop"],
   function(__dependency1__) {
     "use strict";
@@ -22178,7 +20811,7 @@ enifed("ember-routing/ext/run_loop",
     var queues = run.queues;
     run._addQueue('routerTransitions', 'actions');
   });
-enifed("ember-routing/ext/view",
+define("ember-routing/ext/view",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-views/views/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -22335,7 +20968,7 @@ enifed("ember-routing/ext/view",
 
     __exports__["default"] = EmberView;
   });
-enifed("ember-routing/location/api",
+define("ember-routing/location/api",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -22547,7 +21180,7 @@ enifed("ember-routing/location/api",
       }
     };
   });
-enifed("ember-routing/location/auto_location",
+define("ember-routing/location/auto_location",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-routing/location/api","ember-routing/location/history_location","ember-routing/location/hash_location","ember-routing/location/none_location","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
@@ -22905,15 +21538,9 @@ enifed("ember-routing/location/auto_location",
           if (currentPath === historyPath) {
             implementationClass = this._HistoryLocation;
           } else {
-            
-              if (currentPath.substr(0, 2) === '/#') {
-                this._history.replaceState({ path: historyPath }, null, historyPath);
-                implementationClass = this._HistoryLocation;
-              } else {
-                cancelRouterSetup = true;
-                this._replacePath(historyPath);
-              }
-                      }
+            cancelRouterSetup = true;
+            this._replacePath(historyPath);
+          }
 
         } else if (this._getSupportsHashChange()) {
           hashPath = this._getHashPath();
@@ -22941,18 +21568,18 @@ enifed("ember-routing/location/auto_location",
       }
     };
   });
-enifed("ember-routing/location/hash_location",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/object","ember-routing/location/api","exports"],
+define("ember-routing/location/hash_location",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/object","ember-routing/location/api","ember-views/system/jquery","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var run = __dependency4__["default"];
-    var guidFor = __dependency5__.guidFor;
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var run = __dependency3__["default"];
+    var guidFor = __dependency4__.guidFor;
 
-    var EmberObject = __dependency6__["default"];
-    var EmberLocation = __dependency7__["default"];
+    var EmberObject = __dependency5__["default"];
+    var EmberLocation = __dependency6__["default"];
+    var jQuery = __dependency7__["default"];
 
     /**
     @module ember
@@ -22992,9 +21619,7 @@ enifed("ember-routing/location/hash_location",
         @method getURL
       */
       getURL: function() {
-        var path = this.getHash().substr(1);
-        Ember.deprecate('location.hash value is ambiguous. Support for this will be removed soon. When using location: "hash|auto" your hash paths MUST begin with a forward slash. e.g. #/' + path + ' NOT #' + path + '. See http://emberjs.com/guides/deprecations/#toc_location-hash-paths-must-now-include-a-forward-slash-e-g-foo-not-foo', path.length === 0 || path.charAt(0) === '/');
-        return path;
+        return this.getHash().substr(1);
       },
 
       /**
@@ -23037,7 +21662,7 @@ enifed("ember-routing/location/hash_location",
         var self = this;
         var guid = guidFor(this);
 
-        Ember.$(window).on('hashchange.ember-location-'+guid, function() {
+        jQuery(window).on('hashchange.ember-location-'+guid, function() {
           run(function() {
             var path = self.getURL();
             if (get(self, 'lastSetURL') === path) { return; }
@@ -23073,11 +21698,11 @@ enifed("ember-routing/location/hash_location",
       willDestroy: function() {
         var guid = guidFor(this);
 
-        Ember.$(window).off('hashchange.ember-location-'+guid);
+        jQuery(window).off('hashchange.ember-location-'+guid);
       }
     });
   });
-enifed("ember-routing/location/history_location",
+define("ember-routing/location/history_location",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/object","ember-views/system/jquery","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -23150,9 +21775,11 @@ enifed("ember-routing/location/history_location",
         baseURL = baseURL.replace(/\/$/, '');
 
         var url = path.replace(baseURL, '').replace(rootURL, '');
-        var search = location.search || '';
 
-        url += search;
+        
+          var search = location.search || '';
+          url += search;
+        
 
         return url;
       },
@@ -23303,7 +21930,7 @@ enifed("ember-routing/location/history_location",
       }
     });
   });
-enifed("ember-routing/location/none_location",
+define("ember-routing/location/none_location",
   ["ember-metal/property_get","ember-metal/property_set","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -23398,7 +22025,7 @@ enifed("ember-routing/location/none_location",
       }
     });
   });
-enifed("ember-routing/system/cache",
+define("ember-routing/system/cache",
   ["ember-runtime/system/object","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -23433,7 +22060,7 @@ enifed("ember-routing/system/cache",
       cache: null
     });
   });
-enifed("ember-routing/system/controller_for",
+define("ember-routing/system/controller_for",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -23454,7 +22081,7 @@ enifed("ember-routing/system/controller_for",
       return container.lookup('controller:' + controllerName, lookupOptions);
     }
   });
-enifed("ember-routing/system/dsl",
+define("ember-routing/system/dsl",
   ["ember-metal/core","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -23572,7 +22199,7 @@ enifed("ember-routing/system/dsl",
       return dsl;
     };
   });
-enifed("ember-routing/system/generate_controller",
+define("ember-routing/system/generate_controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -23654,8 +22281,8 @@ enifed("ember-routing/system/generate_controller",
       return instance;
     }
   });
-enifed("ember-routing/system/route",
-  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/get_properties","ember-metal/enumerable_utils","ember-metal/is_none","ember-metal/computed","ember-metal/merge","ember-metal/utils","ember-metal/run_loop","ember-metal/keys","ember-runtime/copy","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/action_handler","ember-routing/system/generate_controller","ember-routing-handlebars/helpers/shared","exports"],
+define("ember-routing/system/route",
+  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/get_properties","ember-metal/enumerable_utils","ember-metal/is_none","ember-metal/computed","ember-metal/merge","ember-metal/utils","ember-metal/run_loop","ember-runtime/keys","ember-runtime/copy","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/action_handler","ember-routing/system/generate_controller","ember-routing-handlebars/helpers/shared","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -23696,280 +22323,6 @@ enifed("ember-routing/system/route",
       @uses Ember.ActionHandler
     */
     var Route = EmberObject.extend(ActionHandler, {
-      /**
-        Configuration hash for this route's queryParams. The possible
-        configuration options and their defaults are as follows
-        (assuming a query param whose URL key is `page`):
-
-        ```js
-        queryParams: {
-          page: {
-            // By default, controller query param properties don't
-            // cause a full transition when they are changed, but
-            // rather only cause the URL to update. Setting
-            // `refreshModel` to true will cause an "in-place"
-            // transition to occur, whereby the model hooks for
-            // this route (and any child routes) will re-fire, allowing
-            // you to reload models (e.g., from the server) using the
-            // updated query param values.
-            refreshModel: false,
-
-            // By default, changes to controller query param properties
-            // cause the URL to update via `pushState`, which means an
-            // item will be added to the browser's history, allowing
-            // you to use the back button to restore the app to the
-            // previous state before the query param property was changed.
-            // Setting `replace` to true will use `replaceState` (or its
-            // hash location equivalent), which causes no browser history
-            // item to be added. This options name and default value are
-            // the same as the `link-to` helper's `replace` option.
-            replace: false
-          }
-        }
-        ```
-
-        @property queryParams
-        @for Ember.Route
-        @type Hash
-      */
-      queryParams: {},
-
-      /**
-        @private
-
-        @property _qp
-      */
-      _qp: computed(function() {
-        var controllerName = this.controllerName || this.routeName;
-        var controllerClass = this.container.lookupFactory('controller:' + controllerName);
-
-        if (!controllerClass) {
-          return defaultQPMeta;
-        }
-
-        var controllerProto = controllerClass.proto();
-        var qpProps = get(controllerProto, '_normalizedQueryParams');
-        var cacheMeta = get(controllerProto, '_cacheMeta');
-
-        var qps = [], map = {}, self = this;
-        for (var propName in qpProps) {
-          if (!qpProps.hasOwnProperty(propName)) { continue; }
-
-          var desc = qpProps[propName];
-          var urlKey = desc.as || this.serializeQueryParamKey(propName);
-          var defaultValue = get(controllerProto, propName);
-
-          if (isArray(defaultValue)) {
-            defaultValue = Ember.A(defaultValue.slice());
-          }
-
-          var type = typeOf(defaultValue);
-          var defaultValueSerialized = this.serializeQueryParam(defaultValue, urlKey, type);
-          var fprop = controllerName + ':' + propName;
-          var qp = {
-            def: defaultValue,
-            sdef: defaultValueSerialized,
-            type: type,
-            urlKey: urlKey,
-            prop: propName,
-            fprop: fprop,
-            ctrl: controllerName,
-            cProto: controllerProto,
-            svalue: defaultValueSerialized,
-            cacheType: desc.scope,
-            route: this,
-            cacheMeta: cacheMeta[propName]
-          };
-
-          map[propName] = map[urlKey] = map[fprop] = qp;
-          qps.push(qp);
-        }
-
-        return {
-          qps: qps,
-          map: map,
-          states: {
-            active: function(controller, prop) {
-              return self._activeQPChanged(controller, map[prop]);
-            },
-            allowOverrides: function(controller, prop) {
-              return self._updatingQPChanged(controller, map[prop]);
-            },
-            changingKeys: function(controller, prop) {
-              return self._updateSerializedQPValue(controller, map[prop]);
-            }
-          }
-        };
-      }),
-
-      /**
-        @private
-
-        @property _names
-      */
-      _names: null,
-
-      /**
-        @private
-
-        @method _stashNames
-      */
-      _stashNames: function(_handlerInfo, dynamicParent) {
-        var handlerInfo = _handlerInfo;
-        if (this._names) { return; }
-        var names = this._names = handlerInfo._names;
-
-        if (!names.length) {
-          handlerInfo = dynamicParent;
-          names = handlerInfo && handlerInfo._names || [];
-        }
-
-        var qps = get(this, '_qp.qps');
-        var len = qps.length;
-
-        var namePaths = new Array(names.length);
-        for (var a = 0, nlen = names.length; a < nlen; ++a) {
-          namePaths[a] = handlerInfo.name + '.' + names[a];
-        }
-
-        for (var i = 0; i < len; ++i) {
-          var qp = qps[i];
-          var cacheMeta = qp.cacheMeta;
-          if (cacheMeta.scope === 'model') {
-            cacheMeta.parts = namePaths;
-          }
-          cacheMeta.prefix = qp.ctrl;
-        }
-      },
-
-      /**
-        @private
-
-        @property _updateSerializedQPValue
-      */
-      _updateSerializedQPValue: function(controller, qp) {
-        var value = get(controller, qp.prop);
-        qp.svalue = this.serializeQueryParam(value, qp.urlKey, qp.type);
-      },
-
-      /**
-        @private
-
-        @property _activeQPChanged
-      */
-      _activeQPChanged: function(controller, qp) {
-        var value = get(controller, qp.prop);
-        this.router._queuedQPChanges[qp.fprop] = value;
-        run.once(this, this._fireQueryParamTransition);
-      },
-
-      /**
-        @private
-        @method _updatingQPChanged
-      */
-      _updatingQPChanged: function(controller, qp) {
-        var router = this.router;
-        if (!router._qpUpdates) {
-          router._qpUpdates = {};
-        }
-        router._qpUpdates[qp.urlKey] = true;
-      },
-
-      mergedProperties: ['events', 'queryParams'],
-
-      /**
-        @method paramsFor
-      */
-      paramsFor: function(name) {
-        var route = this.container.lookup('route:' + name);
-
-        if (!route) {
-          return {};
-        }
-
-        var transition = this.router.router.activeTransition;
-        var state = transition ? transition.state : this.router.router.state;
-
-        var params = {};
-        merge(params, state.params[name]);
-        merge(params, getQueryParamsFor(route, state));
-
-        return params;
-      },
-
-      /**
-        @method serializeQueryParamKey
-      */
-      serializeQueryParamKey: function(controllerPropertyName) {
-        return controllerPropertyName;
-      },
-
-      /**
-        @method serializeQueryParam
-      */
-      serializeQueryParam: function(value, urlKey, defaultValueType) {
-        // urlKey isn't used here, but anyone overriding
-        // can use it to provide serialization specific
-        // to a certain query param.
-        if (defaultValueType === 'array') {
-          return JSON.stringify(value);
-        }
-        return '' + value;
-      },
-
-      /**
-        @method deserializeQueryParam
-      */
-      deserializeQueryParam: function(value, urlKey, defaultValueType) {
-        // urlKey isn't used here, but anyone overriding
-        // can use it to provide deserialization specific
-        // to a certain query param.
-
-        // Use the defaultValueType of the default value (the initial value assigned to a
-        // controller query param property), to intelligently deserialize and cast.
-        if (defaultValueType === 'boolean') {
-          return (value === 'true') ? true : false;
-        } else if (defaultValueType === 'number') {
-          return (Number(value)).valueOf();
-        } else if (defaultValueType === 'array') {
-          return Ember.A(JSON.parse(value));
-        }
-        return value;
-      },
-
-
-      /**
-        @private
-        @property _fireQueryParamTransition
-      */
-      _fireQueryParamTransition: function() {
-        this.transitionTo({ queryParams: this.router._queuedQPChanges });
-        this.router._queuedQPChanges = {};
-      },
-
-      /**
-        A hook you can use to reset controller values either when the model
-        changes or the route is exiting.
-
-        ```js
-        App.ArticlesRoute = Ember.Route.extend({
-          // ...
-
-          resetController: function (controller, isExiting, transition) {
-            if (isExiting) {
-              controller.set('page', 1);
-            }
-          }
-        });
-        ```
-
-        @method resetController
-        @param {Controller} controller instance
-        @param {Boolean} isExiting
-        @param {Object} transition
-        @since 1.7.0
-      */
-      resetController: Ember.K,
 
       /**
         @private
@@ -23988,11 +22341,11 @@ enifed("ember-routing/system/route",
         @since 1.7.0
       */
       _reset: function(isExiting, transition) {
-        var controller = this.controller;
-
-        controller._qpDelegate = get(this, '_qp.states.inactive');
-
-        this.resetController(controller, isExiting, transition);
+        
+          var controller = this.controller;
+          controller._qpDelegate = get(this, '_qp.states.inactive');
+          this.resetController(this.controller, isExiting, transition);
+        
       },
 
       /**
@@ -24247,100 +22600,102 @@ enifed("ember-routing/system/route",
       _actions: {
 
         queryParamsDidChange: function(changed, totalPresent, removed) {
-          var totalChanged = keys(changed).concat(keys(removed));
-          for (var i = 0, len = totalChanged.length; i < len; ++i) {
-            var urlKey = totalChanged[i];
-            var options = get(this.queryParams, urlKey) || {};
-            if (get(options, 'refreshModel')) {
-              this.refresh();
+          
+            var totalChanged = keys(changed).concat(keys(removed));
+            for (var i = 0, len = totalChanged.length; i < len; ++i) {
+              var urlKey = totalChanged[i],
+                  options = get(this.queryParams, urlKey) || {};
+              if (get(options, 'refreshModel')) {
+                this.refresh();
+              }
             }
-          }
-
-          return true;
+            return true;
+          
         },
 
         finalizeQueryParamChange: function(params, finalParams, transition) {
-          if (this.routeName !== 'application') { return true; }
+          
+            if (this.routeName !== 'application') { return true; }
 
-          // Transition object is absent for intermediate transitions.
-          if (!transition) { return; }
+            // Transition object is absent for intermediate transitions.
+            if (!transition) { return; }
 
-          var handlerInfos = transition.state.handlerInfos;
-          var router = this.router;
-          var qpMeta = router._queryParamsFor(handlerInfos[handlerInfos.length-1].name);
-          var changes = router._qpUpdates;
-          var replaceUrl;
+            var handlerInfos = transition.state.handlerInfos;
+            var router = this.router;
+            var qpMeta = router._queryParamsFor(handlerInfos[handlerInfos.length-1].name);
+            var changes = router._qpUpdates;
+            var replaceUrl;
 
-          stashParamNames(router, handlerInfos);
+            stashParamNames(router, handlerInfos);
 
-          for (var i = 0, len = qpMeta.qps.length; i < len; ++i) {
-            var qp = qpMeta.qps[i];
-            var route = qp.route;
-            var controller = route.controller;
-            var presentKey = qp.urlKey in params && qp.urlKey;
+            for (var i = 0, len = qpMeta.qps.length; i < len; ++i) {
+              var qp = qpMeta.qps[i];
+              var route = qp.route;
+              var controller = route.controller;
+              var presentKey = qp.urlKey in params && qp.urlKey;
 
-            // Do a reverse lookup to see if the changed query
-            // param URL key corresponds to a QP property on
-            // this controller.
-            var value, svalue;
-            if (changes && qp.urlKey in changes) {
-              // Value updated in/before setupController
-              value = get(controller, qp.prop);
-              svalue = route.serializeQueryParam(value, qp.urlKey, qp.type);
-            } else {
-              if (presentKey) {
-                svalue = params[presentKey];
-                value = route.deserializeQueryParam(svalue, qp.urlKey, qp.type);
+              // Do a reverse lookup to see if the changed query
+              // param URL key corresponds to a QP property on
+              // this controller.
+              var value, svalue;
+              if (changes && qp.urlKey in changes) {
+                // Value updated in/before setupController
+                value = get(controller, qp.prop);
+                svalue = route.serializeQueryParam(value, qp.urlKey, qp.type);
               } else {
-                // No QP provided; use default value.
-                svalue = qp.sdef;
-                value = copyDefaultValue(qp.def);
-              }
-            }
-
-            controller._qpDelegate = get(this, '_qp.states.inactive');
-
-            var thisQueryParamChanged = (svalue !== qp.svalue);
-            if (thisQueryParamChanged) {
-              var options = get(route, 'queryParams.' + qp.urlKey) || {};
-
-              if (transition.queryParamsOnly && replaceUrl !== false) {
-                var replaceConfigValue = get(options, 'replace');
-                if (replaceConfigValue) {
-                  replaceUrl = true;
-                } else if (replaceConfigValue === false) {
-                  // Explicit pushState wins over any other replaceStates.
-                  replaceUrl = false;
+                if (presentKey) {
+                  svalue = params[presentKey];
+                  value = route.deserializeQueryParam(svalue, qp.urlKey, qp.type);
+                } else {
+                  // No QP provided; use default value.
+                  svalue = qp.sdef;
+                  value = copyDefaultValue(qp.def);
                 }
               }
 
-              set(controller, qp.prop, value);
+              controller._qpDelegate = get(this, '_qp.states.inactive');
+
+              var thisQueryParamChanged = (svalue !== qp.svalue);
+              if (thisQueryParamChanged) {
+                var options = get(route, 'queryParams.' + qp.urlKey) || {};
+
+                if (transition.queryParamsOnly && replaceUrl !== false) {
+                  var replaceConfigValue = get(options, 'replace');
+                  if (replaceConfigValue) {
+                    replaceUrl = true;
+                  } else if (replaceConfigValue === false) {
+                    // Explicit pushState wins over any other replaceStates.
+                    replaceUrl = false;
+                  }
+                }
+
+                set(controller, qp.prop, value);
+              }
+
+              // Stash current serialized value of controller.
+              qp.svalue = svalue;
+
+              var thisQueryParamHasDefaultValue = (qp.sdef === svalue);
+              if (!thisQueryParamHasDefaultValue) {
+                finalParams.push({
+                  value: svalue,
+                  visible: true,
+                  key: presentKey || qp.urlKey
+                });
+              }
             }
 
-            // Stash current serialized value of controller.
-            qp.svalue = svalue;
-
-            var thisQueryParamHasDefaultValue = (qp.sdef === svalue);
-            if (!thisQueryParamHasDefaultValue) {
-              finalParams.push({
-                value: svalue,
-                visible: true,
-                key: presentKey || qp.urlKey
-              });
+            if (replaceUrl) {
+              transition.method('replace');
             }
-          }
 
-          if (replaceUrl) {
-            transition.method('replace');
-          }
-
-          forEach(qpMeta.qps, function(qp) {
-            var routeQpMeta = get(qp.route, '_qp');
-            var finalizedController = qp.route.controller;
-            finalizedController._qpDelegate = get(routeQpMeta, 'states.active');
-          });
-
-          router._qpUpdates = null;
+            forEach(qpMeta.qps, function(qp) {
+              var routeQpMeta = get(qp.route, '_qp');
+              var finalizedController = qp.route.controller;
+              finalizedController._qpDelegate = get(routeQpMeta, 'states.active');
+            });
+            router._qpUpdates = null;
+          
         }
       },
 
@@ -24352,6 +22707,8 @@ enifed("ember-routing/system/route",
       */
       events: null,
 
+      mergedProperties: ['events'],
+
       /**
         This hook is executed when the router completely exits this route. It is
         not executed when the model for the route changes.
@@ -24632,22 +22989,23 @@ enifed("ember-routing/system/route",
           Ember.deprecate("Ember.Route.setupControllers is deprecated. Please use Ember.Route.setupController(controller, model) instead.");
           this.setupControllers(controller, context);
         } else {
-          var states = get(this, '_qp.states');
-          if (transition) {
-            // Update the model dep values used to calculate cache keys.
-            stashParamNames(this.router, transition.state.handlerInfos);
-            controller._qpDelegate = states.changingKeys;
-            controller._updateCacheParams(transition.params);
-          }
-          controller._qpDelegate = states.allowOverrides;
+          
+            var states = get(this, '_qp.states');
+            if (transition) {
+              // Update the model dep values used to calculate cache keys.
+              stashParamNames(this.router, transition.state.handlerInfos);
+              controller._qpDelegate = states.changingKeys;
+              controller._updateCacheParams(transition.params);
+            }
+            controller._qpDelegate = states.allowOverrides;
 
-          if (transition) {
-            var qpValues = getQueryParamsFor(this, transition.state);
-            controller.setProperties(qpValues);
-          }
+            if (transition) {
+              var qpValues = getQueryParamsFor(this, transition.state);
+              controller.setProperties(qpValues);
+            }
 
-          this.setupController(controller, context, transition);
-        }
+            this.setupController(controller, context, transition);
+                  }
 
         if (this.renderTemplates) {
           Ember.deprecate("Ember.Route.renderTemplates is deprecated. Please use Ember.Route.renderTemplate(controller, model) instead.");
@@ -24814,7 +23172,7 @@ enifed("ember-routing/system/route",
         });
         ```
 
-        The model for the `post` route is `store.find('post', params.post_id)`.
+        The model for the `post` route is `App.Post.find(params.post_id)`.
 
         By default, if your route has a dynamic segment ending in `_id`:
 
@@ -24857,7 +23215,7 @@ enifed("ember-routing/system/route",
         ```js
         App.PostRoute = Ember.Route.extend({
           model: function(params) {
-            return this.store.find('post', params.post_id);
+            return App.Post.find(params.post_id);
           }
         });
         ```
@@ -24874,7 +23232,10 @@ enifed("ember-routing/system/route",
       model: function(params, transition) {
         var match, name, sawParams, value;
 
-        var queryParams = get(this, '_qp.map');
+        var queryParams;
+        
+          queryParams = get(this, '_qp.map');
+        
 
         for (var prop in params) {
           if (prop === 'queryParams' || (queryParams && prop in queryParams)) {
@@ -24890,7 +23251,7 @@ enifed("ember-routing/system/route",
 
         if (!name && sawParams) { return copy(params); }
         else if (!name) {
-          if (transition.resolveIndex < 1) { return; }
+          if (transition.resolveIndex !== transition.state.handlerInfos.length-1) { return; }
 
           var parentModel = transition.state.handlerInfos[transition.resolveIndex-1].context;
 
@@ -24910,8 +23271,9 @@ enifed("ember-routing/system/route",
         Router.js hook.
        */
       deserialize: function(params, transition) {
-        return this.model(this.paramsFor(this.routeName), transition);
-      },
+        
+          return this.model(this.paramsFor(this.routeName), transition);
+              },
 
       /**
 
@@ -25028,7 +23390,7 @@ enifed("ember-routing/system/route",
         ```js
         App.PhotosRoute = Ember.Route.extend({
           model: function() {
-            return this.store.find('photo');
+            return App.Photo.find();
           },
 
           setupController: function (controller, model) {
@@ -25268,7 +23630,7 @@ enifed("ember-routing/system/route",
         // posts route
         Ember.Route.extend({
           renderTemplate: function(){
-            this.render('photos', {
+            this.render('posts', {
               into: 'application',
               outlet: 'anOutletName'
             })
@@ -25489,6 +23851,240 @@ enifed("ember-routing/system/route",
       states: {}
     };
 
+    
+      Route.reopen({
+        /**
+          Configuration hash for this route's queryParams. The possible
+          configuration options and their defaults are as follows
+          (assuming a query param whose URL key is `page`):
+
+          ```js
+          queryParams: {
+            page: {
+              // By default, controller query param properties don't
+              // cause a full transition when they are changed, but
+              // rather only cause the URL to update. Setting
+              // `refreshModel` to true will cause an "in-place"
+              // transition to occur, whereby the model hooks for
+              // this route (and any child routes) will re-fire, allowing
+              // you to reload models (e.g., from the server) using the
+              // updated query param values.
+              refreshModel: false,
+
+              // By default, changes to controller query param properties
+              // cause the URL to update via `pushState`, which means an
+              // item will be added to the browser's history, allowing
+              // you to use the back button to restore the app to the
+              // previous state before the query param property was changed.
+              // Setting `replace` to true will use `replaceState` (or its
+              // hash location equivalent), which causes no browser history
+              // item to be added. This options name and default value are
+              // the same as the `link-to` helper's `replace` option.
+              replace: false
+            }
+          }
+          ```
+
+          @property queryParams
+          @for Ember.Route
+          @type Hash
+        */
+        queryParams: {},
+
+        _qp: computed(function() {
+          var controllerName = this.controllerName || this.routeName;
+          var fullName = this.container.normalize('controller:' + controllerName);
+          var controllerClass = this.container.lookupFactory(fullName);
+
+          if (!controllerClass) {
+            return defaultQPMeta;
+          }
+
+          var controllerProto = controllerClass.proto();
+          var qpProps = get(controllerProto, '_normalizedQueryParams');
+          var cacheMeta = get(controllerProto, '_cacheMeta');
+
+          var qps = [], map = {}, self = this;
+          for (var propName in qpProps) {
+            if (!qpProps.hasOwnProperty(propName)) { continue; }
+
+            var desc = qpProps[propName],
+                urlKey = desc.as || this.serializeQueryParamKey(propName),
+                defaultValue = get(controllerProto, propName);
+
+            if (isArray(defaultValue)) {
+              defaultValue = Ember.A(defaultValue.slice());
+            }
+
+            var type = typeOf(defaultValue),
+                defaultValueSerialized = this.serializeQueryParam(defaultValue, urlKey, type),
+                fprop = controllerName + ':' + propName,
+                qp = {
+                  def: defaultValue,
+                  sdef: defaultValueSerialized,
+                  type: type,
+                  urlKey: urlKey,
+                  prop: propName,
+                  fprop: fprop,
+                  ctrl: controllerName,
+                  cProto: controllerProto,
+                  svalue: defaultValueSerialized,
+                  cacheType: desc.scope,
+                  route: this,
+                  cacheMeta: cacheMeta[propName]
+                };
+
+            map[propName] = map[urlKey] = map[fprop] = qp;
+            qps.push(qp);
+          }
+
+          return {
+            qps: qps,
+            map: map,
+            states: {
+              active: function(controller, prop) {
+                return self._activeQPChanged(controller, map[prop]);
+              },
+              allowOverrides: function(controller, prop) {
+                return self._updatingQPChanged(controller, map[prop]);
+              },
+              changingKeys: function(controller, prop) {
+                return self._updateSerializedQPValue(controller, map[prop]);
+              }
+            }
+          };
+        }),
+
+        _names: null,
+        _stashNames: function(_handlerInfo, dynamicParent) {
+          var handlerInfo = _handlerInfo;
+          if (this._names) { return; }
+          var names = this._names = handlerInfo._names;
+
+          if (!names.length) {
+            handlerInfo = dynamicParent;
+            names = handlerInfo && handlerInfo._names || [];
+          }
+
+          var qps = get(this, '_qp.qps');
+          var len = qps.length;
+
+          var namePaths = new Array(names.length);
+          for (var a = 0, nlen = names.length; a < nlen; ++a) {
+            namePaths[a] = handlerInfo.name + '.' + names[a];
+          }
+
+          for (var i = 0; i < len; ++i) {
+            var qp = qps[i];
+            var cacheMeta = qp.cacheMeta;
+            if (cacheMeta.scope === 'model') {
+              cacheMeta.parts = namePaths;
+            }
+            cacheMeta.prefix = qp.ctrl;
+          }
+        },
+
+        _updateSerializedQPValue: function(controller, qp) {
+          var value = get(controller, qp.prop);
+          qp.svalue = this.serializeQueryParam(value, qp.urlKey, qp.type);
+        },
+
+        _activeQPChanged: function(controller, qp) {
+          var value = get(controller, qp.prop);
+          this.router._queuedQPChanges[qp.fprop] = value;
+          run.once(this, this._fireQueryParamTransition);
+        },
+
+        _updatingQPChanged: function(controller, qp) {
+          var router = this.router;
+          if (!router._qpUpdates) {
+            router._qpUpdates = {};
+          }
+          router._qpUpdates[qp.urlKey] = true;
+        },
+
+        mergedProperties: ['queryParams'],
+
+        paramsFor: function(name) {
+          var route = this.container.lookup('route:' + name);
+
+          if (!route) {
+            return {};
+          }
+
+          var transition = this.router.router.activeTransition;
+          var state = transition ? transition.state : this.router.router.state;
+
+          var params = {};
+          merge(params, state.params[name]);
+          merge(params, getQueryParamsFor(route, state));
+
+          return params;
+        },
+
+        serializeQueryParamKey: function(controllerPropertyName) {
+          return controllerPropertyName;
+        },
+
+        serializeQueryParam: function(value, urlKey, defaultValueType) {
+          // urlKey isn't used here, but anyone overriding
+          // can use it to provide serialization specific
+          // to a certain query param.
+          if (defaultValueType === 'array') {
+            return JSON.stringify(value);
+          }
+          return '' + value;
+        },
+
+        deserializeQueryParam: function(value, urlKey, defaultValueType) {
+          // urlKey isn't used here, but anyone overriding
+          // can use it to provide deserialization specific
+          // to a certain query param.
+
+          // Use the defaultValueType of the default value (the initial value assigned to a
+          // controller query param property), to intelligently deserialize and cast.
+          if (defaultValueType === 'boolean') {
+            return (value === 'true') ? true : false;
+          } else if (defaultValueType === 'number') {
+            return (Number(value)).valueOf();
+          } else if (defaultValueType === 'array') {
+            return Ember.A(JSON.parse(value));
+          }
+          return value;
+        },
+
+
+        _fireQueryParamTransition: function() {
+          this.transitionTo({ queryParams: this.router._queuedQPChanges });
+          this.router._queuedQPChanges = {};
+        },
+
+        /**
+          A hook you can use to reset controller values either when the model
+          changes or the route is exiting.
+
+          ```js
+          App.ArticlesRoute = Ember.Route.extend({
+            // ...
+
+            resetController: function (controller, isExiting, transition) {
+              if (isExiting) {
+                controller.set('page', 1);
+              }
+            }
+          });
+          ```
+
+          @method resetController
+          @param {Controller} controller instance
+          @param {Boolean} isExiting
+          @param {Object} transition
+          @since 1.7.0
+        */
+        resetController: Ember.K
+      });
+    
+
     function parentRoute(route) {
       var handlerInfo = handlerInfoFor(route, route.router.router.state.handlerInfos, -1);
       return handlerInfo && handlerInfo.handler;
@@ -25526,9 +24122,9 @@ enifed("ember-routing/system/route",
 
       Ember.assert("An outlet ("+options.outlet+") was specified but was not found.", options.outlet === 'main' || options.into);
 
-      var controller = options.controller;
-      var model = options.model;
-      var namedController;
+      var controller = options.controller,
+          model = options.model,
+          namedController;
 
       if (options.controller) {
         controller = options.controller;
@@ -25653,9 +24249,9 @@ enifed("ember-routing/system/route",
 
     __exports__["default"] = Route;
   });
-enifed("ember-routing/system/router",
-  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/properties","ember-metal/computed","ember-metal/merge","ember-metal/run_loop","ember-metal/enumerable_utils","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/evented","ember-routing/system/dsl","ember-views/views/view","ember-routing/location/api","ember-handlebars/views/metamorph_view","ember-routing-handlebars/helpers/shared","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
+define("ember-routing/system/router",
+  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/properties","ember-metal/computed","ember-metal/merge","ember-metal/run_loop","ember-metal/enumerable_utils","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/evented","ember-routing/system/dsl","ember-views/views/view","ember-routing/location/api","ember-handlebars/views/metamorph_view","ember-routing-handlebars/helpers/shared","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // FEATURES, Logger, K, assert
@@ -25678,7 +24274,10 @@ enifed("ember-routing/system/router",
     var routeArgs = __dependency17__.routeArgs;
     var getActiveTargetName = __dependency17__.getActiveTargetName;
     var stashParamNames = __dependency17__.stashParamNames;
-    var create = __dependency18__.create;
+
+    // requireModule("ember-handlebars");
+    // requireModule("ember-runtime");
+    // requireModule("ember-views");
 
     /**
     @module ember
@@ -25963,17 +24562,13 @@ enifed("ember-routing/system/router",
           }
         }
 
-        if (location !== null && typeof location === 'object') {
-          if (rootURL && typeof rootURL === 'string') {
-            location.rootURL = rootURL;
-          }
-
-          // ensure that initState is called AFTER the rootURL is set on
-          // the location instance
-          if (typeof location.initState === 'function') {
-            location.initState();
-          }
+        if (rootURL && typeof rootURL === 'string') {
+          location.rootURL = rootURL;
         }
+
+        // ensure that initState is called AFTER the rootURL is set on
+        // the location instance
+        if (typeof location.initState === 'function') { location.initState(); }
       },
 
       _getHandlerFunction: function() {
@@ -26081,8 +24676,10 @@ enifed("ember-routing/system/router",
         Ember.assert("The route " + targetRouteName + " was not found", targetRouteName && this.router.hasRoute(targetRouteName));
 
         var queryParams = {};
-        merge(queryParams, _queryParams);
-        this._prepareQueryParams(targetRouteName, models, queryParams);
+        
+          merge(queryParams, _queryParams);
+          this._prepareQueryParams(targetRouteName, models, queryParams);
+        
 
         var transitionArgs = routeArgs(targetRouteName, models, queryParams);
         var transitionPromise = this.router.transitionTo.apply(this.router, transitionArgs);
@@ -26112,8 +24709,8 @@ enifed("ember-routing/system/router",
           qps: qps
         };
 
-        var routerjs = this.router;
-        var recogHandlerInfos = routerjs.recognizer.handlersFor(leafRouteName);
+        var routerjs = this.router,
+            recogHandlerInfos = routerjs.recognizer.handlersFor(leafRouteName);
 
         for (var i = 0, len = recogHandlerInfos.length; i < len; ++i) {
           var recogHandler = recogHandlerInfos[i];
@@ -26393,8 +24990,8 @@ enifed("ember-routing/system/router",
         return;
       }
 
-      var infos = router.router.currentHandlerInfos;
-      var path = EmberRouter._routePath(infos);
+      var infos = router.router.currentHandlerInfos,
+          path = EmberRouter._routePath(infos);
 
       if (!('currentPath' in appController)) {
         defineProperty(appController, 'currentPath');
@@ -26511,24 +25108,25 @@ enifed("ember-routing/system/router",
     }
 
     function forEachQueryParam(router, targetRouteName, queryParams, callback) {
-      var qpCache = router._queryParamsFor(targetRouteName);
-      var qps = qpCache.qps;
+      
+        var qpCache = router._queryParamsFor(targetRouteName),
+        qps = qpCache.qps;
 
-      for (var key in queryParams) {
-        if (!queryParams.hasOwnProperty(key)) { continue; }
-        var value = queryParams[key];
-        var qp = qpCache.map[key];
+        for (var key in queryParams) {
+          if (!queryParams.hasOwnProperty(key)) { continue; }
+          var value = queryParams[key],
+          qp = qpCache.map[key];
 
-        if (qp) {
-          callback(key, value, qp);
+          if (qp) {
+            callback(key, value, qp);
+          }
         }
-      }
-    }
+          }
 
     __exports__["default"] = EmberRouter;
   });
-enifed("ember-runtime",
-  ["ember-metal","ember-runtime/core","ember-runtime/compare","ember-runtime/copy","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/tracked_array","ember-runtime/system/subarray","ember-runtime/system/container","ember-runtime/system/application","ember-runtime/system/array_proxy","ember-runtime/system/object_proxy","ember-runtime/system/core_object","ember-runtime/system/each_proxy","ember-runtime/system/native_array","ember-runtime/system/set","ember-runtime/system/string","ember-runtime/system/deferred","ember-runtime/system/lazy_load","ember-runtime/mixins/array","ember-runtime/mixins/comparable","ember-runtime/mixins/copyable","ember-runtime/mixins/enumerable","ember-runtime/mixins/freezable","ember-runtime/mixins/-proxy","ember-runtime/mixins/observable","ember-runtime/mixins/action_handler","ember-runtime/mixins/deferred","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/mutable_array","ember-runtime/mixins/target_action_support","ember-runtime/mixins/evented","ember-runtime/mixins/promise_proxy","ember-runtime/mixins/sortable","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/computed/reduce_computed_macros","ember-runtime/controllers/array_controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/controller","ember-runtime/mixins/controller","ember-runtime/ext/rsvp","ember-runtime/ext/string","ember-runtime/ext/function","exports"],
+define("ember-runtime",
+  ["ember-metal","ember-runtime/core","ember-runtime/keys","ember-runtime/compare","ember-runtime/copy","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/tracked_array","ember-runtime/system/subarray","ember-runtime/system/container","ember-runtime/system/application","ember-runtime/system/array_proxy","ember-runtime/system/object_proxy","ember-runtime/system/core_object","ember-runtime/system/each_proxy","ember-runtime/system/native_array","ember-runtime/system/set","ember-runtime/system/string","ember-runtime/system/deferred","ember-runtime/system/lazy_load","ember-runtime/mixins/array","ember-runtime/mixins/comparable","ember-runtime/mixins/copyable","ember-runtime/mixins/enumerable","ember-runtime/mixins/freezable","ember-runtime/mixins/observable","ember-runtime/mixins/action_handler","ember-runtime/mixins/deferred","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/mutable_array","ember-runtime/mixins/target_action_support","ember-runtime/mixins/evented","ember-runtime/mixins/promise_proxy","ember-runtime/mixins/sortable","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/computed/reduce_computed_macros","ember-runtime/controllers/array_controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/controller","ember-runtime/mixins/controller","ember-runtime/ext/rsvp","ember-runtime/ext/string","ember-runtime/ext/function","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __dependency34__, __dependency35__, __dependency36__, __dependency37__, __dependency38__, __dependency39__, __dependency40__, __dependency41__, __dependency42__, __dependency43__, __dependency44__, __exports__) {
     "use strict";
     /**
@@ -26542,35 +25140,35 @@ enifed("ember-runtime",
     // BEGIN IMPORTS
     var Ember = __dependency1__["default"];
     var isEqual = __dependency2__.isEqual;
-    var compare = __dependency3__["default"];
-    var copy = __dependency4__["default"];
+    var keys = __dependency3__["default"];
+    var compare = __dependency4__["default"];
+    var copy = __dependency5__["default"];
 
-    var Namespace = __dependency5__["default"];
-    var EmberObject = __dependency6__["default"];
-    var TrackedArray = __dependency7__["default"];
-    var SubArray = __dependency8__["default"];
-    var Container = __dependency9__["default"];
-    var Application = __dependency10__["default"];
-    var ArrayProxy = __dependency11__["default"];
-    var ObjectProxy = __dependency12__["default"];
-    var CoreObject = __dependency13__["default"];
-    var EachArray = __dependency14__.EachArray;
-    var EachProxy = __dependency14__.EachProxy;
+    var Namespace = __dependency6__["default"];
+    var EmberObject = __dependency7__["default"];
+    var TrackedArray = __dependency8__["default"];
+    var SubArray = __dependency9__["default"];
+    var Container = __dependency10__["default"];
+    var Application = __dependency11__["default"];
+    var ArrayProxy = __dependency12__["default"];
+    var ObjectProxy = __dependency13__["default"];
+    var CoreObject = __dependency14__["default"];
+    var EachArray = __dependency15__.EachArray;
+    var EachProxy = __dependency15__.EachProxy;
 
-    var NativeArray = __dependency15__["default"];
-    var Set = __dependency16__["default"];
-    var EmberStringUtils = __dependency17__["default"];
-    var Deferred = __dependency18__["default"];
-    var onLoad = __dependency19__.onLoad;
-    var runLoadHooks = __dependency19__.runLoadHooks;
+    var NativeArray = __dependency16__["default"];
+    var Set = __dependency17__["default"];
+    var EmberStringUtils = __dependency18__["default"];
+    var Deferred = __dependency19__["default"];
+    var onLoad = __dependency20__.onLoad;
+    var runLoadHooks = __dependency20__.runLoadHooks;
 
-    var EmberArray = __dependency20__["default"];
-    var Comparable = __dependency21__["default"];
-    var Copyable = __dependency22__["default"];
-    var Enumerable = __dependency23__["default"];
-    var Freezable = __dependency24__.Freezable;
-    var FROZEN_ERROR = __dependency24__.FROZEN_ERROR;
-    var _ProxyMixin = __dependency25__["default"];
+    var EmberArray = __dependency21__["default"];
+    var Comparable = __dependency22__["default"];
+    var Copyable = __dependency23__["default"];
+    var Enumerable = __dependency24__["default"];
+    var Freezable = __dependency25__.Freezable;
+    var FROZEN_ERROR = __dependency25__.FROZEN_ERROR;
 
     var Observable = __dependency26__["default"];
     var ActionHandler = __dependency27__["default"];
@@ -26617,6 +25215,7 @@ enifed("ember-runtime",
     Ember.compare = compare;
     Ember.copy = copy;
     Ember.isEqual = isEqual;
+    Ember.keys = keys;
 
     Ember.Array = EmberArray;
 
@@ -26689,41 +25288,34 @@ enifed("ember-runtime",
     Ember.Controller = Controller;
     Ember.ControllerMixin = ControllerMixin;
 
-    Ember._ProxyMixin = _ProxyMixin;
-
     Ember.RSVP = RSVP;
     // END EXPORTS
 
     __exports__["default"] = Ember;
   });
-enifed("ember-runtime/compare",
-  ["ember-metal/utils","ember-runtime/mixins/comparable","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+define("ember-runtime/compare",
+  ["ember-metal/core","ember-metal/utils","ember-runtime/mixins/comparable","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
-    var typeOf = __dependency1__.typeOf;
-    var Comparable = __dependency2__["default"];
+    var Ember = __dependency1__["default"];
+     // for Ember.ORDER_DEFINITION
+    var typeOf = __dependency2__.typeOf;
+    var Comparable = __dependency3__["default"];
 
-    var TYPE_ORDER = {
-      'undefined': 0,
-      'null': 1,
-      'boolean': 2,
-      'number': 3,
-      'string': 4,
-      'array': 5,
-      'object': 6,
-      'instance': 7,
-      'function': 8,
-      'class': 9,
-      'date': 10
-    };
-
-    //
-    // the spaceship operator
-    //
-    function spaceship(a, b) {
-      var diff = a - b;
-      return (diff > 0) - (diff < 0);
-    }
+    // Used by Ember.compare
+    Ember.ORDER_DEFINITION = Ember.ENV.ORDER_DEFINITION || [
+      'undefined',
+      'null',
+      'boolean',
+      'number',
+      'string',
+      'array',
+      'object',
+      'instance',
+      'function',
+      'class',
+      'date'
+    ];
 
     /**
      This will compare two javascript values of possibly different types.
@@ -26749,52 +25341,74 @@ enifed("ember-runtime/compare",
      @return {Number} -1 if v < w, 0 if v = w and 1 if v > w.
     */
     __exports__["default"] = function compare(v, w) {
-      if (v === w) {
-        return 0;
-      }
+      if (v === w) { return 0; }
 
       var type1 = typeOf(v);
       var type2 = typeOf(w);
 
       if (Comparable) {
-        if (type1 ==='instance' && Comparable.detect(v.constructor)) {
+        if (type1==='instance' && Comparable.detect(v.constructor)) {
           return v.constructor.compare(v, w);
         }
 
         if (type2 === 'instance' && Comparable.detect(w.constructor)) {
-          return 1 - w.constructor.compare(w, v);
+          return 1-w.constructor.compare(w, v);
         }
       }
 
-      var res = spaceship(TYPE_ORDER[type1], TYPE_ORDER[type2]);
-      if (res !== 0) {
-        return res;
+      // If we haven't yet generated a reverse-mapping of Ember.ORDER_DEFINITION,
+      // do so now.
+      var mapping = Ember.ORDER_DEFINITION_MAPPING;
+      if (!mapping) {
+        var order = Ember.ORDER_DEFINITION;
+        mapping = Ember.ORDER_DEFINITION_MAPPING = {};
+        var idx, len;
+        for (idx = 0, len = order.length; idx < len;  ++idx) {
+          mapping[order[idx]] = idx;
+        }
+
+        // We no longer need Ember.ORDER_DEFINITION.
+        delete Ember.ORDER_DEFINITION;
       }
 
+      var type1Index = mapping[type1];
+      var type2Index = mapping[type2];
+
+      if (type1Index < type2Index) { return -1; }
+      if (type1Index > type2Index) { return 1; }
+
       // types are equal - so we have to check values now
       switch (type1) {
         case 'boolean':
         case 'number':
-          return spaceship(v,w);
+          if (v < w) { return -1; }
+          if (v > w) { return 1; }
+          return 0;
 
         case 'string':
-          return spaceship(v.localeCompare(w), 0);
+          var comp = v.localeCompare(w);
+          if (comp < 0) { return -1; }
+          if (comp > 0) { return 1; }
+          return 0;
 
         case 'array':
           var vLen = v.length;
           var wLen = w.length;
-          var len = Math.min(vLen, wLen);
-
-          for (var i = 0; i < len; i++) {
-            var r = compare(v[i], w[i]);
-            if (r !== 0) {
-              return r;
-            }
+          var l = Math.min(vLen, wLen);
+          var r = 0;
+          var i = 0;
+          while (r === 0 && i < l) {
+            r = compare(v[i],w[i]);
+            i++;
           }
+          if (r !== 0) { return r; }
 
           // all elements are equal now
           // shorter array should be ordered first
-          return spaceship(vLen, wLen);
+          if (vLen < wLen) { return -1; }
+          if (vLen > wLen) { return 1; }
+          // arrays are equal now
+          return 0;
 
         case 'instance':
           if (Comparable && Comparable.detect(v)) {
@@ -26803,14 +25417,18 @@ enifed("ember-runtime/compare",
           return 0;
 
         case 'date':
-          return spaceship(v.getTime(), w.getTime());
+          var vNum = v.getTime();
+          var wNum = w.getTime();
+          if (vNum < wNum) { return -1; }
+          if (vNum > wNum) { return 1; }
+          return 0;
 
         default:
           return 0;
       }
     }
   });
-enifed("ember-runtime/computed/array_computed",
+define("ember-runtime/computed/array_computed",
   ["ember-metal/core","ember-runtime/computed/reduce_computed","ember-metal/enumerable_utils","ember-metal/platform","ember-metal/observer","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -26850,11 +25468,9 @@ enifed("ember-runtime/computed/array_computed",
     }
 
     ArrayComputedProperty.prototype = o_create(ReduceComputedProperty.prototype);
-
     ArrayComputedProperty.prototype.initialValue = function () {
       return Ember.A();
     };
-
     ArrayComputedProperty.prototype.resetValue = function (array) {
       array.clear();
       return array;
@@ -26987,8 +25603,8 @@ enifed("ember-runtime/computed/array_computed",
         options = a_slice.call(arguments, -1)[0];
       }
 
-      if (typeof options !== 'object') {
-        throw new EmberError('Array Computed Property declared without an options hash');
+      if (typeof options !== "object") {
+        throw new EmberError("Array Computed Property declared without an options hash");
       }
 
       var cp = new ArrayComputedProperty(options);
@@ -27003,9 +25619,9 @@ enifed("ember-runtime/computed/array_computed",
     __exports__.arrayComputed = arrayComputed;
     __exports__.ArrayComputedProperty = ArrayComputedProperty;
   });
-enifed("ember-runtime/computed/reduce_computed",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/property_events","ember-metal/expand_properties","ember-metal/observer","ember-metal/computed","ember-metal/platform","ember-metal/enumerable_utils","ember-runtime/system/tracked_array","ember-runtime/mixins/array","ember-metal/run_loop","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {
+define("ember-runtime/computed/reduce_computed",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/property_events","ember-metal/expand_properties","ember-metal/observer","ember-metal/computed","ember-metal/platform","ember-metal/enumerable_utils","ember-runtime/system/tracked_array","ember-runtime/mixins/array","ember-metal/run_loop","ember-runtime/system/set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert
@@ -27029,6 +25645,7 @@ enifed("ember-runtime/computed/reduce_computed",
     var TrackedArray = __dependency12__["default"];
     var EmberArray = __dependency13__["default"];
     var run = __dependency14__["default"];
+    var Set = __dependency15__["default"];
     var isArray = __dependency4__.isArray;
 
     var cacheSet = cacheFor.set;
@@ -27091,7 +25708,7 @@ enifed("ember-runtime/computed/reduce_computed",
     }
 
     function ItemPropertyObserverContext (dependentArray, index, trackedArray) {
-      Ember.assert('Internal error: trackedArray is null or undefined', trackedArray);
+      Ember.assert("Internal error: trackedArray is null or undefined", trackedArray);
 
       this.dependentArray = dependentArray;
       this.index = index;
@@ -27099,6 +25716,7 @@ enifed("ember-runtime/computed/reduce_computed",
       this.trackedArray = trackedArray;
       this.beforeObserver = null;
       this.observer = null;
+
       this.destroyed = false;
     }
 
@@ -27106,7 +25724,6 @@ enifed("ember-runtime/computed/reduce_computed",
       setValue: function (newValue) {
         this.instanceMeta.setValue(newValue, true);
       },
-
       getValue: function () {
         return this.instanceMeta.getValue();
       },
@@ -27145,9 +25762,9 @@ enifed("ember-runtime/computed/reduce_computed",
       },
 
       setupPropertyObservers: function (dependentKey, itemPropertyKeys) {
-        var dependentArray = get(this.instanceMeta.context, dependentKey);
-        var length = get(dependentArray, 'length');
-        var observerContexts = new Array(length);
+        var dependentArray = get(this.instanceMeta.context, dependentKey),
+            length = get(dependentArray, 'length'),
+            observerContexts = new Array(length);
 
         this.resetTransformations(dependentKey, observerContexts);
 
@@ -27163,9 +25780,11 @@ enifed("ember-runtime/computed/reduce_computed",
       },
 
       teardownPropertyObservers: function (dependentKey, itemPropertyKeys) {
-        var dependentArrayObserver = this;
-        var trackedArray = this.trackedArraysByGuid[dependentKey];
-        var beforeObserver, observer, item;
+        var dependentArrayObserver = this,
+            trackedArray = this.trackedArraysByGuid[dependentKey],
+            beforeObserver,
+            observer,
+            item;
 
         if (!trackedArray) { return; }
 
@@ -27200,7 +25819,6 @@ enifed("ember-runtime/computed/reduce_computed",
         observerContext.beforeObserver = function (obj, keyName) {
           return dependentArrayObserver.itemPropertyWillChange(obj, keyName, observerContext.dependentArray, observerContext);
         };
-
         observerContext.observer = function (obj, keyName) {
           return dependentArrayObserver.itemPropertyDidChange(obj, keyName, observerContext.dependentArray, observerContext);
         };
@@ -27212,7 +25830,6 @@ enifed("ember-runtime/computed/reduce_computed",
 
       trackAdd: function (dependentKey, index, newItems) {
         var trackedArray = this.trackedArraysByGuid[dependentKey];
-
         if (trackedArray) {
           trackedArray.addItems(index, newItems);
         }
@@ -27278,10 +25895,9 @@ enifed("ember-runtime/computed/reduce_computed",
           forEach(itemPropertyKeys, removeObservers, this);
 
           changeMeta = new ChangeMeta(dependentArray, item, itemIndex, this.instanceMeta.propertyName, this.cp, normalizedRemoveCount);
-          this.setValue(removedItem.call(
+          this.setValue( removedItem.call(
             this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
         }
-        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
       },
 
       dependentArrayDidChange: function (dependentArray, index, removedCount, addedCount) {
@@ -27294,15 +25910,13 @@ enifed("ember-runtime/computed/reduce_computed",
         var itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey];
         var length = get(dependentArray, 'length');
         var normalizedIndex = normalizeIndex(index, length, addedCount);
-        var endIndex = normalizedIndex + addedCount;
         var changeMeta, observerContext;
 
-        forEach(dependentArray.slice(normalizedIndex, endIndex), function (item, sliceIndex) {
+        forEach(dependentArray.slice(normalizedIndex, normalizedIndex + addedCount), function (item, sliceIndex) {
           if (itemPropertyKeys) {
-            observerContext = this.createPropertyObserverContext(dependentArray, normalizedIndex + sliceIndex,
-              this.trackedArraysByGuid[dependentKey]);
-            observerContexts[sliceIndex] = observerContext;
-
+            observerContext =
+              observerContexts[sliceIndex] =
+              this.createPropertyObserverContext(dependentArray, normalizedIndex + sliceIndex, this.trackedArraysByGuid[dependentKey]);
             forEach(itemPropertyKeys, function (propertyKey) {
               addBeforeObserver(item, propertyKey, this, observerContext.beforeObserver);
               addObserver(item, propertyKey, this, observerContext.observer);
@@ -27310,10 +25924,10 @@ enifed("ember-runtime/computed/reduce_computed",
           }
 
           changeMeta = new ChangeMeta(dependentArray, item, normalizedIndex + sliceIndex, this.instanceMeta.propertyName, this.cp, addedCount);
-          this.setValue(addedItem.call(
+          this.setValue( addedItem.call(
             this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
         }, this);
-        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
+
         this.trackAdd(dependentKey, normalizedIndex, observerContexts);
       },
 
@@ -27322,26 +25936,25 @@ enifed("ember-runtime/computed/reduce_computed",
 
         if (!this.changedItems[guid]) {
           this.changedItems[guid] = {
-            array: array,
-            observerContext: observerContext,
-            obj: obj,
-            previousValues: {}
+            array:            array,
+            observerContext:  observerContext,
+            obj:              obj,
+            previousValues:   {}
           };
         }
-
         ++this.changedItemCount;
+
         this.changedItems[guid].previousValues[keyName] = get(obj, keyName);
       },
 
-      itemPropertyDidChange: function (obj, keyName, array, observerContext) {
+      itemPropertyDidChange: function(obj, keyName, array, observerContext) {
         if (--this.changedItemCount === 0) {
           this.flushChanges();
         }
       },
 
-      flushChanges: function () {
-        var changedItems = this.changedItems;
-        var key, c, changeMeta;
+      flushChanges: function() {
+        var changedItems = this.changedItems, key, c, changeMeta;
 
         for (key in changedItems) {
           c = changedItems[key];
@@ -27355,9 +25968,7 @@ enifed("ember-runtime/computed/reduce_computed",
           this.setValue(
             this.callbacks.addedItem.call(this.instanceMeta.context, this.getValue(), c.obj, changeMeta, this.instanceMeta.sugarMeta));
         }
-
         this.changedItems = {};
-        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
       }
     };
 
@@ -27389,26 +26000,26 @@ enifed("ember-runtime/computed/reduce_computed",
       }
     }
 
-    function addItems(dependentArray, callbacks, cp, propertyName, meta) {
+    function addItems (dependentArray, callbacks, cp, propertyName, meta) {
       forEach(dependentArray, function (item, index) {
         meta.setValue( callbacks.addedItem.call(
           this, meta.getValue(), item, new ChangeMeta(dependentArray, item, index, propertyName, cp, dependentArray.length), meta.sugarMeta));
       }, this);
-      callbacks.flushedChanges.call(this, meta.getValue(), meta.sugarMeta);
     }
 
     function reset(cp, propertyName) {
-      var callbacks = cp._callbacks();
-      var hadMeta = cp._hasInstanceMeta(this, propertyName);
-      var meta = cp._instanceMeta(this, propertyName);
+      var callbacks = cp._callbacks(),
+          meta;
 
-      if (hadMeta) { meta.setValue(cp.resetValue(meta.getValue())); }
+      if (cp._hasInstanceMeta(this, propertyName)) {
+        meta = cp._instanceMeta(this, propertyName);
+        meta.setValue(cp.resetValue(meta.getValue()));
+      } else {
+        meta = cp._instanceMeta(this, propertyName);
+      }
 
       if (cp.options.initialize) {
-        cp.options.initialize.call(this, meta.getValue(), {
-          property: cp,
-          propertyName: propertyName
-        }, meta.sugarMeta);
+        cp.options.initialize.call(this, meta.getValue(), { property: cp, propertyName: propertyName }, meta.sugarMeta);
       }
     }
 
@@ -27425,15 +26036,16 @@ enifed("ember-runtime/computed/reduce_computed",
       this.context = context;
       this.propertyName = propertyName;
       this.cache = metaFor(context).cache;
+
       this.dependentArrays = {};
       this.sugarMeta = {};
+
       this.initialValue = initialValue;
     }
 
     ReduceComputedPropertyInstanceMeta.prototype = {
       getValue: function () {
         var value = cacheGet(this.cache, this.propertyName);
-
         if (value !== undefined) {
           return value;
         } else {
@@ -27476,11 +26088,11 @@ enifed("ember-runtime/computed/reduce_computed",
 
     __exports__.ReduceComputedProperty = ReduceComputedProperty;
     // TODO: default export
-
     function ReduceComputedProperty(options) {
       var cp = this;
 
       this.options = options;
+
       this._dependentKeys = null;
       // A map of dependentKey -> [itemProperty, ...] that tracks what properties of
       // items in the array we must track to update this property.
@@ -27496,25 +26108,24 @@ enifed("ember-runtime/computed/reduce_computed",
         // coalesce by, in addition to the target and method.
         run.once(this, recompute, propertyName);
       };
-
       var recompute = function(propertyName) {
-        var dependentKeys = cp._dependentKeys;
-        var meta = cp._instanceMeta(this, propertyName);
-        var callbacks = cp._callbacks();
+        var dependentKeys = cp._dependentKeys,
+            meta = cp._instanceMeta(this, propertyName),
+            callbacks = cp._callbacks();
 
         reset.call(this, cp, propertyName);
 
         meta.dependentArraysObserver.suspendArrayObservers(function () {
           forEach(cp._dependentKeys, function (dependentKey) {
             Ember.assert(
-              'dependent array ' + dependentKey + ' must be an `Ember.Array`.  ' +
-              'If you are not extending arrays, you will need to wrap native arrays with `Ember.A`',
+              "dependent array " + dependentKey + " must be an `Ember.Array`.  " +
+              "If you are not extending arrays, you will need to wrap native arrays with `Ember.A`",
               !(isArray(get(this, dependentKey)) && !EmberArray.detect(get(this, dependentKey))));
 
             if (!partiallyRecomputeFor(this, dependentKey)) { return; }
 
-            var dependentArray = get(this, dependentKey);
-            var previousDependentArray = meta.dependentArrays[dependentKey];
+            var dependentArray = get(this, dependentKey),
+                previousDependentArray = meta.dependentArrays[dependentKey];
 
             if (dependentArray === previousDependentArray) {
               // The array may be the same, but our item property keys may have
@@ -27543,7 +26154,6 @@ enifed("ember-runtime/computed/reduce_computed",
           if (!partiallyRecomputeFor(this, dependentKey)) { return; }
 
           var dependentArray = get(this, dependentKey);
-
           if (dependentArray) {
             addItems.call(this, dependentArray, callbacks, cp, propertyName, meta);
           }
@@ -27552,7 +26162,7 @@ enifed("ember-runtime/computed/reduce_computed",
 
 
       this.func = function (propertyName) {
-        Ember.assert('Computed reduce values require at least one dependent key', cp._dependentKeys);
+        Ember.assert("Computed reduce values require at least one dependent key", cp._dependentKeys);
 
         recompute.call(this, propertyName);
 
@@ -27569,14 +26179,11 @@ enifed("ember-runtime/computed/reduce_computed",
     ReduceComputedProperty.prototype._callbacks = function () {
       if (!this.callbacks) {
         var options = this.options;
-
         this.callbacks = {
           removedItem: options.removedItem || defaultCallback,
-          addedItem: options.addedItem || defaultCallback,
-          flushedChanges: options.flushedChanges || defaultCallback
+          addedItem: options.addedItem || defaultCallback
         };
       }
-
       return this.callbacks;
     };
 
@@ -27585,8 +26192,8 @@ enifed("ember-runtime/computed/reduce_computed",
     };
 
     ReduceComputedProperty.prototype._instanceMeta = function (context, propertyName) {
-      var cacheMeta = metaFor(context).cacheMeta;
-      var meta = cacheMeta[propertyName];
+      var cacheMeta = metaFor(context).cacheMeta,
+          meta = cacheMeta[propertyName];
 
       if (!meta) {
         meta = cacheMeta[propertyName] = new ReduceComputedPropertyInstanceMeta(context, propertyName, this.initialValue());
@@ -27622,35 +26229,33 @@ enifed("ember-runtime/computed/reduce_computed",
     };
 
     ReduceComputedProperty.prototype.property = function () {
-      var cp = this;
-      var args = a_slice.call(arguments);
-      var propertyArgs = {};
-      var match, dependentArrayKey, itemPropertyKey;
+      var cp = this,
+          args = a_slice.call(arguments),
+          propertyArgs = new Set(),
+          match,
+          dependentArrayKey,
+          itemPropertyKey;
 
       forEach(args, function (dependentKey) {
         if (doubleEachPropertyPattern.test(dependentKey)) {
-          throw new EmberError('Nested @each properties not supported: ' + dependentKey);
+          throw new EmberError("Nested @each properties not supported: " + dependentKey);
         } else if (match = eachPropertyPattern.exec(dependentKey)) {
           dependentArrayKey = match[1];
 
-          var itemPropertyKeyPattern = match[2];
-          var addItemPropertyKey = function (itemPropertyKey) {
-            cp.itemPropertyKey(dependentArrayKey, itemPropertyKey);
-          };
+          var itemPropertyKeyPattern = match[2],
+              addItemPropertyKey = function (itemPropertyKey) {
+                cp.itemPropertyKey(dependentArrayKey, itemPropertyKey);
+              };
 
           expandProperties(itemPropertyKeyPattern, addItemPropertyKey);
-          propertyArgs[guidFor(dependentArrayKey)] = dependentArrayKey;
+          propertyArgs.add(dependentArrayKey);
         } else {
-          propertyArgs[guidFor(dependentKey)] = dependentKey;
+          propertyArgs.add(dependentKey);
         }
       });
 
-      var propertyArgsToArray = [];
-      for (var guid in propertyArgs) {
-        propertyArgsToArray.push(propertyArgs[guid]);
-      }
+      return ComputedProperty.prototype.property.apply(this, propertyArgs.toArray());
 
-      return ComputedProperty.prototype.property.apply(this, propertyArgsToArray);
     };
 
     /**
@@ -27786,8 +26391,8 @@ enifed("ember-runtime/computed/reduce_computed",
           // `content.@each.reversedName` above, we would be getting the objects
           // directly and not have access to `reversedName`.
           //
-          var reversedNameA = get(personA, 'reversedName');
-          var reversedNameB = get(personB, 'reversedName');
+          var reversedNameA = get(personA, 'reversedName'),
+              reversedNameB = get(personB, 'reversedName');
 
           return Ember.compare(reversedNameA, reversedNameB);
         })
@@ -27846,12 +26451,12 @@ enifed("ember-runtime/computed/reduce_computed",
         options = a_slice.call(arguments, -1)[0];
       }
 
-      if (typeof options !== 'object') {
-        throw new EmberError('Reduce Computed Property declared without an options hash');
+      if (typeof options !== "object") {
+        throw new EmberError("Reduce Computed Property declared without an options hash");
       }
 
       if (!('initialValue' in options)) {
-        throw new EmberError('Reduce Computed Property declared without an initial value');
+        throw new EmberError("Reduce Computed Property declared without an initial value");
       }
 
       var cp = new ReduceComputedProperty(options);
@@ -27865,9 +26470,9 @@ enifed("ember-runtime/computed/reduce_computed",
 
     __exports__.reduceComputed = reduceComputed;
   });
-enifed("ember-runtime/computed/reduce_computed_macros",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/run_loop","ember-metal/observer","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/system/subarray","ember-metal/keys","ember-runtime/compare","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
+define("ember-runtime/computed/reduce_computed_macros",
+  ["ember-metal/core","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/run_loop","ember-metal/observer","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/system/object_proxy","ember-runtime/system/subarray","ember-runtime/keys","ember-runtime/compare","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -27876,19 +26481,21 @@ enifed("ember-runtime/computed/reduce_computed_macros",
 
     var Ember = __dependency1__["default"];
     // Ember.assert
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var isArray = __dependency4__.isArray;
-    var guidFor = __dependency4__.guidFor;
-    var EmberError = __dependency5__["default"];
-    var forEach = __dependency6__.forEach;
-    var run = __dependency7__["default"];
-    var addObserver = __dependency8__.addObserver;
-    var arrayComputed = __dependency9__.arrayComputed;
-    var reduceComputed = __dependency10__.reduceComputed;
-    var SubArray = __dependency11__["default"];
-    var keys = __dependency12__["default"];
-    var compare = __dependency13__["default"];
+    var merge = __dependency2__["default"];
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var isArray = __dependency5__.isArray;
+    var guidFor = __dependency5__.guidFor;
+    var EmberError = __dependency6__["default"];
+    var forEach = __dependency7__.forEach;
+    var run = __dependency8__["default"];
+    var addObserver = __dependency9__.addObserver;
+    var arrayComputed = __dependency10__.arrayComputed;
+    var reduceComputed = __dependency11__.reduceComputed;
+    var ObjectProxy = __dependency12__["default"];
+    var SubArray = __dependency13__["default"];
+    var keys = __dependency14__["default"];
+    var compare = __dependency15__["default"];
 
     var a_slice = [].slice;
 
@@ -27950,7 +26557,7 @@ enifed("ember-runtime/computed/reduce_computed_macros",
       @param {String} dependentKey
       @return {Ember.ComputedProperty} computes the largest value in the dependentKey's array
     */
-    function max(dependentKey) {
+    function max (dependentKey) {
       return reduceComputed(dependentKey, {
         initialValue: -Infinity,
 
@@ -28020,17 +26627,16 @@ enifed("ember-runtime/computed/reduce_computed_macros",
 
       The callback method you provide should have the following signature.
       `item` is the current item in the iteration.
-      `index` is the integer index of the current item in the iteration.
 
       ```javascript
-      function(item, index);
+      function(item);
       ```
 
       Example
 
       ```javascript
       var Hamster = Ember.Object.extend({
-        excitingChores: Ember.computed.map('chores', function(chore, index) {
+        excitingChores: Ember.computed.map('chores', function(chore) {
           return chore.toUpperCase() + '!';
         })
       });
@@ -28051,7 +26657,7 @@ enifed("ember-runtime/computed/reduce_computed_macros",
     function map(dependentKey, callback) {
       var options = {
         addedItem: function(array, item, changeMeta, instanceMeta) {
-          var mapped = callback.call(this, item, changeMeta.index);
+          var mapped = callback.call(this, item);
           array.insertAt(changeMeta.index, mapped);
           return array;
         },
@@ -28112,25 +26718,24 @@ enifed("ember-runtime/computed/reduce_computed_macros",
 
       The callback method you provide should have the following signature.
       `item` is the current item in the iteration.
-      `index` is the integer index of the current item in the iteration.
 
       ```javascript
-      function(item, index);
+      function(item);
       ```
 
       ```javascript
       var Hamster = Ember.Object.extend({
-        remainingChores: Ember.computed.filter('chores', function(chore, index) {
+        remainingChores: Ember.computed.filter('chores', function(chore) {
           return !chore.done;
         })
       });
 
-      var hamster = Hamster.create({
+      var hamster = Hamster.create({ 
         chores: [
           { name: 'cook', done: true },
           { name: 'clean', done: true },
           { name: 'write more unit tests', done: false }
-        ]
+        ] 
       });
 
       hamster.get('remainingChores'); // [{name: 'write more unit tests', done: false}]
@@ -28148,9 +26753,9 @@ enifed("ember-runtime/computed/reduce_computed_macros",
           instanceMeta.filteredArrayIndexes = new SubArray();
         },
 
-        addedItem: function (array, item, changeMeta, instanceMeta) {
-          var match = !!callback.call(this, item, changeMeta.index);
-          var filterIndex = instanceMeta.filteredArrayIndexes.addItem(changeMeta.index, match);
+        addedItem: function(array, item, changeMeta, instanceMeta) {
+          var match = !!callback.call(this, item),
+              filterIndex = instanceMeta.filteredArrayIndexes.addItem(changeMeta.index, match);
 
           if (match) {
             array.insertAt(filterIndex, item);
@@ -28256,7 +26861,6 @@ enifed("ember-runtime/computed/reduce_computed_macros",
     */
     function uniq() {
       var args = a_slice.call(arguments);
-
       args.push({
         initialize: function(array, changeMeta, instanceMeta) {
           instanceMeta.itemCounts = {};
@@ -28267,25 +26871,22 @@ enifed("ember-runtime/computed/reduce_computed_macros",
 
           if (!instanceMeta.itemCounts[guid]) {
             instanceMeta.itemCounts[guid] = 1;
-            array.pushObject(item);
           } else {
             ++instanceMeta.itemCounts[guid];
           }
+          array.addObject(item);
           return array;
         },
-
         removedItem: function(array, item, _, instanceMeta) {
-          var guid = guidFor(item);
-          var itemCounts = instanceMeta.itemCounts;
+          var guid = guidFor(item),
+              itemCounts = instanceMeta.itemCounts;
 
           if (--itemCounts[guid] === 0) {
             array.removeObject(item);
           }
-
           return array;
         }
       });
-
       return arrayComputed.apply(null, args);
     }
 
@@ -28324,7 +26925,6 @@ enifed("ember-runtime/computed/reduce_computed_macros",
     */
     function intersect() {
       var args = a_slice.call(arguments);
-
       args.push({
         initialize: function (array, changeMeta, instanceMeta) {
           instanceMeta.itemCounts = {};
@@ -28336,22 +26936,16 @@ enifed("ember-runtime/computed/reduce_computed_macros",
           var numberOfDependentArrays = changeMeta.property._dependentKeys.length;
           var itemCounts = instanceMeta.itemCounts;
 
-          if (!itemCounts[itemGuid]) {
-            itemCounts[itemGuid] = {};
-          }
-
-          if (itemCounts[itemGuid][dependentGuid] === undefined) {
-            itemCounts[itemGuid][dependentGuid] = 0;
-          }
+          if (!itemCounts[itemGuid]) { itemCounts[itemGuid] = {}; }
+          if (itemCounts[itemGuid][dependentGuid] === undefined) { itemCounts[itemGuid][dependentGuid] = 0; }
 
           if (++itemCounts[itemGuid][dependentGuid] === 1 &&
               numberOfDependentArrays === keys(itemCounts[itemGuid]).length) {
+
             array.addObject(item);
           }
-
           return array;
         },
-
         removedItem: function(array, item, changeMeta, instanceMeta) {
           var itemGuid = guidFor(item);
           var dependentGuid = guidFor(changeMeta.arrayChanged);
@@ -28370,14 +26964,11 @@ enifed("ember-runtime/computed/reduce_computed_macros",
             if (numberOfArraysItemAppearsIn === 0) {
               delete itemCounts[itemGuid];
             }
-
             array.removeObject(item);
           }
-
           return array;
         }
       });
-
       return arrayComputed.apply(null, args);
     }
 
@@ -28414,13 +27005,12 @@ enifed("ember-runtime/computed/reduce_computed_macros",
     */
     function setDiff(setAProperty, setBProperty) {
       if (arguments.length !== 2) {
-        throw new EmberError('setDiff requires exactly two dependent arrays.');
+        throw new EmberError("setDiff requires exactly two dependent arrays.");
       }
-
       return arrayComputed(setAProperty, setBProperty, {
         addedItem: function (array, item, changeMeta, instanceMeta) {
-          var setA = get(this, setAProperty);
-          var setB = get(this, setBProperty);
+          var setA = get(this, setAProperty),
+              setB = get(this, setBProperty);
 
           if (changeMeta.arrayChanged === setA) {
             if (!setB.contains(item)) {
@@ -28429,13 +27019,12 @@ enifed("ember-runtime/computed/reduce_computed_macros",
           } else {
             array.removeObject(item);
           }
-
           return array;
         },
 
         removedItem: function (array, item, changeMeta, instanceMeta) {
-          var setA = get(this, setAProperty);
-          var setB = get(this, setBProperty);
+          var setA = get(this, setAProperty),
+              setB = get(this, setBProperty);
 
           if (changeMeta.arrayChanged === setB) {
             if (setA.contains(item)) {
@@ -28444,7 +27033,6 @@ enifed("ember-runtime/computed/reduce_computed_macros",
           } else {
             array.removeObject(item);
           }
-
           return array;
         }
       });
@@ -28453,13 +27041,8 @@ enifed("ember-runtime/computed/reduce_computed_macros",
     __exports__.setDiff = setDiff;function binarySearch(array, item, low, high) {
       var mid, midItem, res, guidMid, guidItem;
 
-      if (arguments.length < 4) {
-        high = get(array, 'length');
-      }
-
-      if (arguments.length < 3) {
-        low = 0;
-      }
+      if (arguments.length < 4) { high = get(array, 'length'); }
+      if (arguments.length < 3) { low = 0; }
 
       if (low === high) {
         return low;
@@ -28468,15 +27051,14 @@ enifed("ember-runtime/computed/reduce_computed_macros",
       mid = low + Math.floor((high - low) / 2);
       midItem = array.objectAt(mid);
 
-      guidMid = guidFor(midItem);
-      guidItem = guidFor(item);
+      guidMid = _guidFor(midItem);
+      guidItem = _guidFor(item);
 
       if (guidMid === guidItem) {
         return mid;
       }
 
       res = this.order(midItem, item);
-
       if (res === 0) {
         res = guidMid < guidItem ? -1 : 1;
       }
@@ -28489,9 +27071,18 @@ enifed("ember-runtime/computed/reduce_computed_macros",
       }
 
       return mid;
+
+      function _guidFor(item) {
+        if (SearchProxy.detectInstance(item)) {
+          return guidFor(get(item, 'content'));
+        }
+        return guidFor(item);
+      }
     }
 
 
+    var SearchProxy = ObjectProxy.extend();
+
     /**
       A computed property which returns a new array with all the
       properties from the first dependent array sorted based on a property
@@ -28557,64 +27148,27 @@ enifed("ember-runtime/computed/reduce_computed_macros",
       on the sort property array or callback function
     */
     function sort(itemsKey, sortDefinition) {
-      Ember.assert('Ember.computed.sort requires two arguments: an array key to sort and ' +
-        'either a sort properties key or sort function', arguments.length === 2);
+      Ember.assert("Ember.computed.sort requires two arguments: an array key to sort and either a sort properties key or sort function", arguments.length === 2);
+
+      var initFn, sortPropertiesKey;
 
       if (typeof sortDefinition === 'function') {
-        return customSort(itemsKey, sortDefinition);
-      } else {
-        return propertySort(itemsKey, sortDefinition);
-      }
-    }
-
-    __exports__.sort = sort;function customSort(itemsKey, comparator) {
-      return arrayComputed(itemsKey, {
-        initialize: function (array, changeMeta, instanceMeta) {
-          instanceMeta.order = comparator;
+        initFn = function (array, changeMeta, instanceMeta) {
+          instanceMeta.order = sortDefinition;
           instanceMeta.binarySearch = binarySearch;
-          instanceMeta.waitingInsertions = [];
-          instanceMeta.insertWaiting = function() {
-            var index, item;
-            var waiting = instanceMeta.waitingInsertions;
-            instanceMeta.waitingInsertions = [];
-            for (var i=0; i<waiting.length; i++) {
-              item = waiting[i];
-              index = instanceMeta.binarySearch(array, item);
-              array.insertAt(index, item);
-            }
-          };
-          instanceMeta.insertLater = function(item) {
-            this.waitingInsertions.push(item);
-          };
-        },
-
-        addedItem: function (array, item, changeMeta, instanceMeta) {
-          instanceMeta.insertLater(item);
-          return array;
-        },
-
-        removedItem: function (array, item, changeMeta, instanceMeta) {
-          array.removeObject(item);
-          return array;
-        },
-
-        flushedChanges: function(array, instanceMeta) {
-          instanceMeta.insertWaiting();
-        }
-      });
-    }
-
-    function propertySort(itemsKey, sortPropertiesKey) {
-      return arrayComputed(itemsKey, {
-        initialize: function (array, changeMeta, instanceMeta) {
+        };
+      } else {
+        sortPropertiesKey = sortDefinition;
+        initFn = function (array, changeMeta, instanceMeta) {
           function setupSortProperties() {
-            var sortPropertyDefinitions = get(this, sortPropertiesKey);
-            var sortProperties = instanceMeta.sortProperties = [];
-            var sortPropertyAscending = instanceMeta.sortPropertyAscending = {};
-            var sortProperty, idx, asc;
+            var sortPropertyDefinitions = get(this, sortPropertiesKey),
+                sortProperty,
+                sortProperties = instanceMeta.sortProperties = [],
+                sortPropertyAscending = instanceMeta.sortPropertyAscending = {},
+                idx,
+                asc;
 
-            Ember.assert('Cannot sort: \'' + sortPropertiesKey + '\' is not an array.',
-                         isArray(sortPropertyDefinitions));
+            Ember.assert("Cannot sort: '" + sortPropertiesKey + "' is not an array.", isArray(sortPropertyDefinitions));
 
             changeMeta.property.clearItemPropertyKeys(itemsKey);
 
@@ -28645,17 +27199,17 @@ enifed("ember-runtime/computed/reduce_computed_macros",
           }
 
           addObserver(this, sortPropertiesKey, updateSortPropertiesOnce);
+
           setupSortProperties.call(this);
 
+
           instanceMeta.order = function (itemA, itemB) {
-            var sortProperty, result, asc;
-            var keyA = this.keyFor(itemA);
-            var keyB = this.keyFor(itemB);
+            var isProxy = itemB instanceof SearchProxy,
+                sortProperty, result, asc;
 
             for (var i = 0; i < this.sortProperties.length; ++i) {
               sortProperty = this.sortProperties[i];
-
-              result = compare(keyA[sortProperty], keyB[sortProperty]);
+              result = compare(get(itemA, sortProperty), isProxy ? itemB[sortProperty] : get(itemB, sortProperty));
 
               if (result !== 0) {
                 asc = this.sortPropertyAscending[sortProperty];
@@ -28667,8 +27221,11 @@ enifed("ember-runtime/computed/reduce_computed_macros",
           };
 
           instanceMeta.binarySearch = binarySearch;
-          setupKeyCache(instanceMeta);
-        },
+        };
+      }
+
+      return arrayComputed(itemsKey, {
+        initialize: initFn,
 
         addedItem: function (array, item, changeMeta, instanceMeta) {
           var index = instanceMeta.binarySearch(array, item);
@@ -28677,38 +27234,26 @@ enifed("ember-runtime/computed/reduce_computed_macros",
         },
 
         removedItem: function (array, item, changeMeta, instanceMeta) {
-          var index = instanceMeta.binarySearch(array, item);
+          var proxyProperties, index, searchItem;
+
+          if (changeMeta.previousValues) {
+            proxyProperties = merge({ content: item }, changeMeta.previousValues);
+
+            searchItem = SearchProxy.create(proxyProperties);
+          } else {
+            searchItem = item;
+          }
+
+          index = instanceMeta.binarySearch(array, searchItem);
           array.removeAt(index);
-          instanceMeta.dropKeyFor(item);
           return array;
         }
       });
     }
 
-    function setupKeyCache(instanceMeta) {
-      instanceMeta.keyFor = function(item) {
-        var guid = guidFor(item);
-        if (this.keyCache[guid]) {
-          return this.keyCache[guid];
-        }
-        var sortProperty;
-        var key = {};
-        for (var i = 0; i < this.sortProperties.length; ++i) {
-          sortProperty = this.sortProperties[i];
-          key[sortProperty] = get(item, sortProperty);
-        }
-        return this.keyCache[guid] = key;
-      };
-
-      instanceMeta.dropKeyFor = function(item) {
-        var guid = guidFor(item);
-        this.keyCache[guid] = null;
-      };
-
-      instanceMeta.keyCache = {};
-    }
+    __exports__.sort = sort;
   });
-enifed("ember-runtime/controllers/array_controller",
+define("ember-runtime/controllers/array_controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-runtime/system/array_proxy","ember-runtime/mixins/sortable","ember-runtime/mixins/controller","ember-metal/computed","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -28769,9 +27314,9 @@ enifed("ember-runtime/controllers/array_controller",
       For example:
 
       ```handlebars
-      {{#each post in controller}}
-        <li>{{post.title}} ({{post.titleLength}} characters)</li>
-      {{/each}}
+        {{#each post in controller}}
+          <li>{{post.title}} ({{post.titleLength}} characters)</li>
+        {{/each}}
       ```
 
       ```javascript
@@ -28781,6 +27326,7 @@ enifed("ember-runtime/controllers/array_controller",
 
       App.PostController = Ember.ObjectController.extend({
         // the `title` property will be proxied to the underlying post.
+
         titleLength: function() {
           return this.get('title').length;
         }.property('title')
@@ -28818,22 +27364,10 @@ enifed("ember-runtime/controllers/array_controller",
     __exports__["default"] = ArrayProxy.extend(ControllerMixin, SortableMixin, {
 
       /**
-        The controller used to wrap items, if any. If the value is a string, it will
-        be used to lookup the container for the controller. As an alternative, you
-        can also provide a controller class as the value.
-
-        For example:
-
-        ```javascript
-        App.MyArrayController = Ember.ArrayController.extend({
-          itemController: Ember.ObjectController.extend({
-            //Item Controller Implementation
-          })
-        });
-        ```
+        The controller used to wrap items, if any.
 
         @property itemController
-        @type String | Ember.Controller
+        @type String
         @default null
       */
       itemController: null,
@@ -28874,7 +27408,6 @@ enifed("ember-runtime/controllers/array_controller",
 
         if (idx >= 0 && idx < length) {
           controllerClass = this.lookupItemController(object);
-
           if (controllerClass) {
             return this.controllerAt(idx, object, controllerClass);
           }
@@ -28935,9 +27468,10 @@ enifed("ember-runtime/controllers/array_controller",
       _isVirtual: false,
 
       controllerAt: function(idx, object, controllerClass) {
+        var fullName, subController, parentController;
+
         var container = get(this, 'container');
         var subControllers = this._subControllers;
-        var fullName, subController, subControllerFactory, parentController, options;
 
         if (subControllers.length > idx) {
           subController = subControllers[idx];
@@ -28947,25 +27481,23 @@ enifed("ember-runtime/controllers/array_controller",
           }
         }
 
+        fullName = 'controller:' + controllerClass;
+
+        if (!container.has(fullName)) {
+          throw new EmberError('Could not resolve itemController: "' + controllerClass + '"');
+        }
+
         if (this._isVirtual) {
           parentController = get(this, 'parentController');
         } else {
           parentController = this;
         }
 
-        
-          fullName = 'controller:' + controllerClass;
-
-          if (!container.has(fullName)) {
-            throw new EmberError('Could not resolve itemController: "' + controllerClass + '"');
-          }
-
-          subController = container.lookupFactory(fullName).create({
-            target: parentController,
-            parentController: parentController,
-            model: object
-          });
-        
+        subController = container.lookupFactory(fullName).create({
+          target: parentController,
+          parentController: parentController,
+          model: object
+        });
 
         subControllers[idx] = subController;
 
@@ -28981,7 +27513,6 @@ enifed("ember-runtime/controllers/array_controller",
         if (subControllers.length) {
           for (var i = 0, length = subControllers.length; length > i; i++) {
             controller = subControllers[i];
-
             if (controller) {
               controller.destroy();
             }
@@ -28997,7 +27528,7 @@ enifed("ember-runtime/controllers/array_controller",
       }
     });
   });
-enifed("ember-runtime/controllers/controller",
+define("ember-runtime/controllers/controller",
   ["ember-runtime/system/object","ember-runtime/mixins/controller","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -29017,7 +27548,7 @@ enifed("ember-runtime/controllers/controller",
     */
     __exports__["default"] = EmberObject.extend(Mixin);
   });
-enifed("ember-runtime/controllers/object_controller",
+define("ember-runtime/controllers/object_controller",
   ["ember-runtime/mixins/controller","ember-runtime/system/object_proxy","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -29044,42 +27575,34 @@ enifed("ember-runtime/controllers/object_controller",
     **/
     __exports__["default"] = ObjectProxy.extend(ControllerMixin);
   });
-enifed("ember-runtime/copy",
-  ["ember-metal/enumerable_utils","ember-metal/utils","ember-runtime/system/object","ember-runtime/mixins/copyable","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+define("ember-runtime/copy",
+  ["ember-metal/enumerable_utils","ember-metal/utils","ember-runtime/system/object","ember-runtime/mixins/copyable","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var indexOf = __dependency1__.indexOf;
     var typeOf = __dependency2__.typeOf;
     var EmberObject = __dependency3__["default"];
     var Copyable = __dependency4__["default"];
+    var create = __dependency5__.create;
 
     function _copy(obj, deep, seen, copies) {
       var ret, loc, key;
 
       // primitive data types are immutable, just return them.
-      if (typeof obj !== 'object' || obj === null) {
-        return obj;
-      }
+      if ('object' !== typeof obj || obj===null) return obj;
 
       // avoid cyclical loops
-      if (deep && (loc = indexOf(seen, obj)) >= 0) {
-        return copies[loc];
-      }
+      if (deep && (loc=indexOf(seen, obj))>=0) return copies[loc];
 
-      Ember.assert('Cannot clone an Ember.Object that does not implement Ember.Copyable',
-        !(obj instanceof EmberObject) || (Copyable && Copyable.detect(obj)));
+      Ember.assert('Cannot clone an Ember.Object that does not implement Ember.Copyable', !(obj instanceof EmberObject) || (Copyable && Copyable.detect(obj)));
 
       // IMPORTANT: this specific test will detect a native array only. Any other
       // object will need to implement Copyable.
       if (typeOf(obj) === 'array') {
         ret = obj.slice();
-
         if (deep) {
           loc = ret.length;
-
-          while (--loc >= 0) {
-            ret[loc] = _copy(ret[loc], deep, seen, copies);
-          }
+          while(--loc>=0) ret[loc] = _copy(ret[loc], deep, seen, copies);
         }
       } else if (Copyable && Copyable.detect(obj)) {
         ret = obj.copy(deep, seen, copies);
@@ -29087,18 +27610,12 @@ enifed("ember-runtime/copy",
         ret = new Date(obj.getTime());
       } else {
         ret = {};
-
-        for (key in obj) {
-          // support Null prototype
-          if (!Object.prototype.hasOwnProperty.call(obj, key)) {
-            continue;
-          }
+        for(key in obj) {
+          if (!obj.hasOwnProperty(key)) continue;
 
           // Prevents browsers that don't respect non-enumerability from
           // copying internal Ember properties
-          if (key.substring(0, 2) === '__') {
-            continue;
-          }
+          if (key.substring(0,2) === '__') continue;
 
           ret[key] = deep ? _copy(obj[key], deep, seen, copies) : obj[key];
         }
@@ -29128,18 +27645,12 @@ enifed("ember-runtime/copy",
     */
     __exports__["default"] = function copy(obj, deep) {
       // fast paths
-      if ('object' !== typeof obj || obj === null) {
-        return obj; // can't copy primitives
-      }
-
-      if (Copyable && Copyable.detect(obj)) {
-        return obj.copy(deep);
-      }
-
+      if ('object' !== typeof obj || obj === null) return obj; // can't copy primitives
+      if (Copyable && Copyable.detect(obj)) return obj.copy(deep);
       return _copy(obj, deep, deep ? [] : null, deep ? [] : null);
     }
   });
-enifed("ember-runtime/core",
+define("ember-runtime/core",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -29167,21 +27678,17 @@ enifed("ember-runtime/core",
       @return {Boolean}
     */
     var isEqual = function isEqual(a, b) {
-      if (a && typeof a.isEqual === 'function') {
-        return a.isEqual(b);
-      }
-
+      if (a && 'function'===typeof a.isEqual) return a.isEqual(b);
       if (a instanceof Date && b instanceof Date) {
         return a.getTime() === b.getTime();
       }
-
       return a === b;
     };
     __exports__.isEqual = isEqual;
   });
-enifed("ember-runtime/ext/function",
-  ["ember-metal/core","ember-metal/expand_properties","ember-metal/computed","ember-metal/mixin"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
+define("ember-runtime/ext/function",
+  ["ember-metal/core","ember-metal/expand_properties","ember-metal/computed"],
+  function(__dependency1__, __dependency2__, __dependency3__) {
     "use strict";
     /**
     @module ember
@@ -29192,7 +27699,6 @@ enifed("ember-runtime/ext/function",
     // Ember.EXTEND_PROTOTYPES, Ember.assert
     var expandProperties = __dependency2__["default"];
     var computed = __dependency3__.computed;
-    var observer = __dependency4__.observer;
 
     var a_slice = Array.prototype.slice;
     var FunctionPrototype = Function.prototype;
@@ -29213,15 +27719,17 @@ enifed("ember-runtime/ext/function",
 
           fullName: function() {
             return this.get('firstName') + ' ' + this.get('lastName');
-          }.property() // Call this flag to mark the function as a property
+
+            // Call this flag to mark the function as a property
+          }.property()
         });
 
         var president = MyApp.President.create({
-          firstName: 'Barack',
-          lastName: 'Obama'
+          firstName: "Barack",
+          lastName: "Obama"
         });
 
-        president.get('fullName'); // 'Barack Obama'
+        president.get('fullName');    // "Barack Obama"
         ```
 
         Treating a function like a property is useful because they can work with
@@ -29257,7 +27765,7 @@ enifed("ember-runtime/ext/function",
         @method property
         @for Function
       */
-      FunctionPrototype.property = function () {
+      FunctionPrototype.property = function() {
         var ret = computed(this);
         // ComputedProperty.prototype.property expands properties; no need for us to
         // do so here.
@@ -29290,12 +27798,16 @@ enifed("ember-runtime/ext/function",
         @for Function
       */
       FunctionPrototype.observes = function() {
-        var length = arguments.length;
-        var args = new Array(length);
-        for (var x = 0; x < length; x++) {
-          args[x] = arguments[x];
+        var addWatchedProperty = function (obs) { watched.push(obs); };
+        var watched = [];
+
+        for (var i=0; i<arguments.length; ++i) {
+          expandProperties(arguments[i], addWatchedProperty);
         }
-        return observer.apply(this, args.concat(this));
+
+        this.__ember_observes__ = watched;
+
+        return this;
       };
 
       /**
@@ -29323,11 +27835,10 @@ enifed("ember-runtime/ext/function",
         @method observesImmediately
         @for Function
       */
-      FunctionPrototype.observesImmediately = function () {
-        for (var i = 0, l = arguments.length; i < l; i++) {
+      FunctionPrototype.observesImmediately = function() {
+        for (var i=0, l=arguments.length; i<l; i++) {
           var arg = arguments[i];
-          Ember.assert('Immediate observers must observe internal properties only, ' +
-            'not properties on other objects.', arg.indexOf('.') === -1);
+          Ember.assert("Immediate observers must observe internal properties only, not properties on other objects.", arg.indexOf('.') === -1);
         }
 
         // observes handles property expansion
@@ -29356,13 +27867,11 @@ enifed("ember-runtime/ext/function",
         @method observesBefore
         @for Function
       */
-      FunctionPrototype.observesBefore = function () {
+      FunctionPrototype.observesBefore = function() {
+        var addWatchedProperty = function (obs) { watched.push(obs); };
         var watched = [];
-        var addWatchedProperty = function (obs) {
-          watched.push(obs);
-        };
 
-        for (var i = 0, l = arguments.length; i < l; ++i) {
+        for (var i=0; i<arguments.length; ++i) {
           expandProperties(arguments[i], addWatchedProperty);
         }
 
@@ -29392,57 +27901,26 @@ enifed("ember-runtime/ext/function",
         @method on
         @for Function
       */
-      FunctionPrototype.on = function () {
+      FunctionPrototype.on = function() {
         var events = a_slice.call(arguments);
         this.__ember_listens__ = events;
-
         return this;
       };
     }
   });
-enifed("ember-runtime/ext/rsvp",
-  ["ember-metal/core","ember-metal/logger","ember-metal/run_loop","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+define("ember-runtime/ext/rsvp",
+  ["ember-metal/core","ember-metal/logger","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     /* globals RSVP:true */
 
     var Ember = __dependency1__["default"];
     var Logger = __dependency2__["default"];
-    var run = __dependency3__["default"];
 
-    var RSVP = requireModule('rsvp');
-    var testModuleName = 'ember-testing/test';
-    var Test;
+    var RSVP = requireModule("rsvp");
+    var Test, testModuleName = 'ember-testing/test';
 
-    var asyncStart = function() {
-      if (Ember.Test && Ember.Test.adapter) {
-        Ember.Test.adapter.asyncStart();
-      }
-    };
-
-    var asyncEnd = function() {
-      if (Ember.Test && Ember.Test.adapter) {
-        Ember.Test.adapter.asyncEnd();
-      }
-    };
-
-    RSVP.configure('async', function(callback, promise) {
-      var async = !run.currentRunLoop;
-
-      if (Ember.testing && async) { asyncStart(); }
-
-      run.backburner.schedule('actions', function(){
-        if (Ember.testing && async) { asyncEnd(); }
-        callback(promise);
-      });
-    });
-
-    RSVP.Promise.prototype.fail = function(callback, label){
-      Ember.deprecate('RSVP.Promise.fail has been renamed as RSVP.Promise.catch');
-      return this['catch'](callback, label);
-    };
-
-    RSVP.onerrorDefault = function (error) {
+    RSVP.onerrorDefault = function(error) {
       if (error instanceof Error) {
         if (Ember.testing) {
           // ES6TODO: remove when possible
@@ -29468,7 +27946,7 @@ enifed("ember-runtime/ext/rsvp",
 
     __exports__["default"] = RSVP;
   });
-enifed("ember-runtime/ext/string",
+define("ember-runtime/ext/string",
   ["ember-metal/core","ember-runtime/system/string"],
   function(__dependency1__, __dependency2__) {
     "use strict";
@@ -29499,7 +27977,7 @@ enifed("ember-runtime/ext/string",
         @method fmt
         @for String
       */
-      StringPrototype.fmt = function () {
+      StringPrototype.fmt = function() {
         return fmt(this, arguments);
       };
 
@@ -29509,7 +27987,7 @@ enifed("ember-runtime/ext/string",
         @method w
         @for String
       */
-      StringPrototype.w = function () {
+      StringPrototype.w = function() {
         return w(this);
       };
 
@@ -29519,7 +27997,7 @@ enifed("ember-runtime/ext/string",
         @method loc
         @for String
       */
-      StringPrototype.loc = function () {
+      StringPrototype.loc = function() {
         return loc(this, arguments);
       };
 
@@ -29529,7 +28007,7 @@ enifed("ember-runtime/ext/string",
         @method camelize
         @for String
       */
-      StringPrototype.camelize = function () {
+      StringPrototype.camelize = function() {
         return camelize(this);
       };
 
@@ -29539,7 +28017,7 @@ enifed("ember-runtime/ext/string",
         @method decamelize
         @for String
       */
-      StringPrototype.decamelize = function () {
+      StringPrototype.decamelize = function() {
         return decamelize(this);
       };
 
@@ -29549,7 +28027,7 @@ enifed("ember-runtime/ext/string",
         @method dasherize
         @for String
       */
-      StringPrototype.dasherize = function () {
+      StringPrototype.dasherize = function() {
         return dasherize(this);
       };
 
@@ -29559,7 +28037,7 @@ enifed("ember-runtime/ext/string",
         @method underscore
         @for String
       */
-      StringPrototype.underscore = function () {
+      StringPrototype.underscore = function() {
         return underscore(this);
       };
 
@@ -29569,7 +28047,7 @@ enifed("ember-runtime/ext/string",
         @method classify
         @for String
       */
-      StringPrototype.classify = function () {
+      StringPrototype.classify = function() {
         return classify(this);
       };
 
@@ -29579,110 +28057,70 @@ enifed("ember-runtime/ext/string",
         @method capitalize
         @for String
       */
-      StringPrototype.capitalize = function () {
+      StringPrototype.capitalize = function() {
         return capitalize(this);
       };
     }
   });
-enifed("ember-runtime/mixins/-proxy",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/observer","ember-metal/property_events","ember-metal/computed","ember-metal/properties","ember-metal/mixin","ember-runtime/system/string","ember-runtime/system/object","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+define("ember-runtime/keys",
+  ["ember-metal/enumerable_utils","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    /**
-    @module ember
-    @submodule ember-runtime
-    */
-
-    var Ember = __dependency1__["default"];
-    // Ember.assert
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var meta = __dependency4__.meta;
-    var addObserver = __dependency5__.addObserver;
-    var removeObserver = __dependency5__.removeObserver;
-    var addBeforeObserver = __dependency5__.addBeforeObserver;
-    var removeBeforeObserver = __dependency5__.removeBeforeObserver;
-    var propertyWillChange = __dependency6__.propertyWillChange;
-    var propertyDidChange = __dependency6__.propertyDidChange;
-    var computed = __dependency7__.computed;
-    var defineProperty = __dependency8__.defineProperty;
-    var Mixin = __dependency9__.Mixin;
-    var observer = __dependency9__.observer;
-    var fmt = __dependency10__.fmt;
-    var EmberObject = __dependency11__["default"];
-
-    function contentPropertyWillChange(content, contentKey) {
-      var key = contentKey.slice(8); // remove "content."
-      if (key in this) { return; }  // if shadowed in proxy
-      propertyWillChange(this, key);
-    }
-
-    function contentPropertyDidChange(content, contentKey) {
-      var key = contentKey.slice(8); // remove "content."
-      if (key in this) { return; } // if shadowed in proxy
-      propertyDidChange(this, key);
-    }
+    var EnumerableUtils = __dependency1__["default"];
+    var create = __dependency2__.create;
 
     /**
-      `Ember.ProxyMixin` forwards all properties not defined by the proxy itself
-      to a proxied `content` object.  See Ember.ObjectProxy for more details.
+      Returns all of the keys defined on an object or hash. This is useful
+      when inspecting objects for debugging. On browsers that support it, this
+      uses the native `Object.keys` implementation.
 
-      @class ProxyMixin
-      @namespace Ember
+      @method keys
+      @for Ember
+      @param {Object} obj
+      @return {Array} Array containing keys of obj
     */
-    __exports__["default"] = Mixin.create({
-      /**
-        The object whose properties will be forwarded.
+    var keys = Object.keys;
+    if (!keys || create.isSimulated) {
+      var prototypeProperties = [
+        'constructor',
+        'hasOwnProperty',
+        'isPrototypeOf',
+        'propertyIsEnumerable',
+        'valueOf',
+        'toLocaleString',
+        'toString'
+      ],
+      pushPropertyName = function(obj, array, key) {
+        // Prevents browsers that don't respect non-enumerability from
+        // copying internal Ember properties
+        if (key.substring(0,2) === '__') return;
+        if (key === '_super') return;
+        if (EnumerableUtils.indexOf(array, key) >= 0) return;
+        if (!Object.prototype.hasOwnProperty.call(obj, key)) return;
 
-        @property content
-        @type Ember.Object
-        @default null
-      */
-      content: null,
-      _contentDidChange: observer('content', function() {
-        Ember.assert("Can't set Proxy's content to itself", get(this, 'content') !== this);
-      }),
+        array.push(key);
+      };
 
-      isTruthy: computed.bool('content'),
-
-      _debugContainerKey: null,
-
-      willWatchProperty: function (key) {
-        var contentKey = 'content.' + key;
-        addBeforeObserver(this, contentKey, null, contentPropertyWillChange);
-        addObserver(this, contentKey, null, contentPropertyDidChange);
-      },
-
-      didUnwatchProperty: function (key) {
-        var contentKey = 'content.' + key;
-        removeBeforeObserver(this, contentKey, null, contentPropertyWillChange);
-        removeObserver(this, contentKey, null, contentPropertyDidChange);
-      },
-
-      unknownProperty: function (key) {
-        var content = get(this, 'content');
-        if (content) {
-          return get(content, key);
-        }
-      },
-
-      setUnknownProperty: function (key, value) {
-        var m = meta(this);
-        if (m.proto === this) {
-          // if marked as prototype then just defineProperty
-          // rather than delegate
-          defineProperty(this, key, null, value);
-          return value;
+      keys = function keys(obj) {
+        var ret = [], key;
+        for (key in obj) {
+          pushPropertyName(obj, ret, key);
         }
 
-        var content = get(this, 'content');
-        Ember.assert(fmt("Cannot delegate set('%@', %@) to the 'content' property of object proxy %@: its 'content' is undefined.", [key, value, this]), content);
-        return set(content, key, value);
-      }
+        // IE8 doesn't enumerate property that named the same as prototype properties.
+        for (var i = 0, l = prototypeProperties.length; i < l; i++) {
+          key = prototypeProperties[i];
 
-    });
+          pushPropertyName(obj, ret, key);
+        }
+
+        return ret;
+      };
+    }
+
+    __exports__["default"] = keys;
   });
-enifed("ember-runtime/mixins/action_handler",
+define("ember-runtime/mixins/action_handler",
   ["ember-metal/merge","ember-metal/mixin","ember-metal/property_get","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -29892,8 +28330,7 @@ enifed("ember-runtime/mixins/action_handler",
         @param {*} context a context to send with the action
       */
       send: function(actionName) {
-        var args = [].slice.call(arguments, 1);
-        var target;
+        var args = [].slice.call(arguments, 1), target;
 
         if (this._actions && this._actions[actionName]) {
           if (this._actions[actionName].apply(this, args) === true) {
@@ -29901,6 +28338,13 @@ enifed("ember-runtime/mixins/action_handler",
           } else {
             return;
           }
+        } else if (!Ember.FEATURES.isEnabled('ember-routing-drop-deprecated-action-style') && this.deprecatedSend && this.deprecatedSendHandles && this.deprecatedSendHandles(actionName)) {
+          Ember.warn("The current default is deprecated but will prefer to handle actions directly on the controller instead of a similarly named action in the actions hash. To turn off this deprecated feature set: Ember.FEATURES['ember-routing-drop-deprecated-action-style'] = true");
+          if (this.deprecatedSend.apply(this, [].slice.call(arguments)) === true) {
+            // handler return true, so this action will bubble
+          } else {
+            return;
+          }
         }
 
         if (target = get(this, 'target')) {
@@ -29912,9 +28356,9 @@ enifed("ember-runtime/mixins/action_handler",
 
     __exports__["default"] = ActionHandler;
   });
-enifed("ember-runtime/mixins/array",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/computed","ember-metal/is_none","ember-runtime/mixins/enumerable","ember-metal/enumerable_utils","ember-metal/mixin","ember-metal/property_events","ember-metal/events","ember-metal/watching","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+define("ember-runtime/mixins/array",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/is_none","ember-runtime/mixins/enumerable","ember-metal/enumerable_utils","ember-metal/mixin","ember-metal/property_events","ember-metal/events","ember-metal/watching","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -29926,41 +28370,24 @@ enifed("ember-runtime/mixins/array",
     //
     var Ember = __dependency1__["default"];
     // ES6TODO: Ember.A
+
     var get = __dependency2__.get;
-    var computed = __dependency3__.computed;
-    var cacheFor = __dependency3__.cacheFor;
-    var isNone = __dependency4__.isNone;
-    var none = __dependency4__.none;
-    var Enumerable = __dependency5__["default"];
-    var map = __dependency6__.map;
-    var Mixin = __dependency7__.Mixin;
-    var required = __dependency7__.required;
-    var propertyWillChange = __dependency8__.propertyWillChange;
-    var propertyDidChange = __dependency8__.propertyDidChange;
-    var addListener = __dependency9__.addListener;
-    var removeListener = __dependency9__.removeListener;
-    var sendEvent = __dependency9__.sendEvent;
-    var hasListeners = __dependency9__.hasListeners;
-    var isWatching = __dependency10__.isWatching;
-
-    function arrayObserversHelper(obj, target, opts, operation, notify) {
-      var willChange = (opts && opts.willChange) || 'arrayWillChange';
-      var didChange  = (opts && opts.didChange) || 'arrayDidChange';
-      var hasObservers = get(obj, 'hasArrayObservers');
-
-      if (hasObservers === notify) {
-        propertyWillChange(obj, 'hasArrayObservers');
-      }
-
-      operation(obj, '@array:before', target, willChange);
-      operation(obj, '@array:change', target, didChange);
-
-      if (hasObservers === notify) {
-        propertyDidChange(obj, 'hasArrayObservers');
-      }
-
-      return obj;
-    }
+    var set = __dependency3__.set;
+    var computed = __dependency4__.computed;
+    var cacheFor = __dependency4__.cacheFor;
+    var isNone = __dependency5__.isNone;
+    var none = __dependency5__.none;
+    var Enumerable = __dependency6__["default"];
+    var map = __dependency7__.map;
+    var Mixin = __dependency8__.Mixin;
+    var required = __dependency8__.required;
+    var propertyWillChange = __dependency9__.propertyWillChange;
+    var propertyDidChange = __dependency9__.propertyDidChange;
+    var addListener = __dependency10__.addListener;
+    var removeListener = __dependency10__.removeListener;
+    var sendEvent = __dependency10__.sendEvent;
+    var hasListeners = __dependency10__.hasListeners;
+    var isWatching = __dependency11__.isWatching;
 
     // ..........................................................
     // ARRAY
@@ -30022,9 +28449,8 @@ enifed("ember-runtime/mixins/array",
 
         ```javascript
         var arr = ['a', 'b', 'c', 'd'];
-
-        arr.objectAt(0);   // 'a'
-        arr.objectAt(3);   // 'd'
+        arr.objectAt(0);   // "a"
+        arr.objectAt(3);   // "d"
         arr.objectAt(-1);  // undefined
         arr.objectAt(4);   // undefined
         arr.objectAt(5);   // undefined
@@ -30035,10 +28461,7 @@ enifed("ember-runtime/mixins/array",
         @return {*} item at index or undefined
       */
       objectAt: function(idx) {
-        if (idx < 0 || idx >= get(this, 'length')) {
-          return undefined;
-        }
-
+        if ((idx < 0) || (idx >= get(this, 'length'))) return undefined;
         return get(this, idx);
       },
 
@@ -30047,9 +28470,8 @@ enifed("ember-runtime/mixins/array",
 
         ```javascript
         var arr = ['a', 'b', 'c', 'd'];
-
-        arr.objectsAt([0, 1, 2]);  // ['a', 'b', 'c']
-        arr.objectsAt([2, 3, 4]);  // ['c', 'd', undefined]
+        arr.objectsAt([0, 1, 2]);  // ["a", "b", "c"]
+        arr.objectsAt([2, 3, 4]);  // ["c", "d", undefined]
         ```
 
         @method objectsAt
@@ -30058,10 +28480,7 @@ enifed("ember-runtime/mixins/array",
        */
       objectsAt: function(indexes) {
         var self = this;
-
-        return map(indexes, function(idx) {
-          return self.objectAt(idx);
-        });
+        return map(indexes, function(idx) { return self.objectAt(idx); });
       },
 
       // overrides Ember.Enumerable version
@@ -30080,11 +28499,8 @@ enifed("ember-runtime/mixins/array",
         @return this
       */
       '[]': computed(function(key, value) {
-        if (value !== undefined) {
-          this.replace(0, get(this, 'length'), value);
-        }
-
-        return this;
+        if (value !== undefined) this.replace(0, get(this, 'length'), value) ;
+        return this ;
       }),
 
       firstObject: computed(function() {
@@ -30092,7 +28508,7 @@ enifed("ember-runtime/mixins/array",
       }),
 
       lastObject: computed(function() {
-        return this.objectAt(get(this, 'length') - 1);
+        return this.objectAt(get(this, 'length')-1);
       }),
 
       // optimized version from Enumerable
@@ -30108,7 +28524,6 @@ enifed("ember-runtime/mixins/array",
 
         ```javascript
         var arr = ['red', 'green', 'blue'];
-
         arr.slice(0);       // ['red', 'green', 'blue']
         arr.slice(0, 2);    // ['red', 'green']
         arr.slice(1, 100);  // ['green', 'blue']
@@ -30121,29 +28536,17 @@ enifed("ember-runtime/mixins/array",
       */
       slice: function(beginIndex, endIndex) {
         var ret = Ember.A();
-        var length = get(this, 'length');
+        var length = get(this, 'length') ;
+        if (isNone(beginIndex)) beginIndex = 0 ;
+        if (isNone(endIndex) || (endIndex > length)) endIndex = length ;
 
-        if (isNone(beginIndex)) {
-          beginIndex = 0;
+        if (beginIndex < 0) beginIndex = length + beginIndex;
+        if (endIndex < 0) endIndex = length + endIndex;
+
+        while(beginIndex < endIndex) {
+          ret[ret.length] = this.objectAt(beginIndex++) ;
         }
-
-        if (isNone(endIndex) || (endIndex > length)) {
-          endIndex = length;
-        }
-
-        if (beginIndex < 0) {
-          beginIndex = length + beginIndex;
-        }
-
-        if (endIndex < 0) {
-          endIndex = length + endIndex;
-        }
-
-        while (beginIndex < endIndex) {
-          ret[ret.length] = this.objectAt(beginIndex++);
-        }
-
-        return ret;
+        return ret ;
       },
 
       /**
@@ -30153,14 +28556,13 @@ enifed("ember-runtime/mixins/array",
         the end of the array. Returns -1 if no match is found.
 
         ```javascript
-        var arr = ['a', 'b', 'c', 'd', 'a'];
-
-        arr.indexOf('a');       //  0
-        arr.indexOf('z');       // -1
-        arr.indexOf('a', 2);    //  4
-        arr.indexOf('a', -1);   //  4
-        arr.indexOf('b', 3);    // -1
-        arr.indexOf('a', 100);  // -1
+        var arr = ["a", "b", "c", "d", "a"];
+        arr.indexOf("a");       //  0
+        arr.indexOf("z");       // -1
+        arr.indexOf("a", 2);    //  4
+        arr.indexOf("a", -1);   //  4
+        arr.indexOf("b", 3);    // -1
+        arr.indexOf("a", 100);  // -1
         ```
 
         @method indexOf
@@ -30169,23 +28571,14 @@ enifed("ember-runtime/mixins/array",
         @return {Number} index or -1 if not found
       */
       indexOf: function(object, startAt) {
-        var len = get(this, 'length');
-        var idx;
+        var idx, len = get(this, 'length');
 
-        if (startAt === undefined) {
-          startAt = 0;
+        if (startAt === undefined) startAt = 0;
+        if (startAt < 0) startAt += len;
+
+        for(idx = startAt; idx < len; idx++) {
+          if (this.objectAt(idx) === object) return idx;
         }
-
-        if (startAt < 0) {
-          startAt += len;
-        }
-
-        for (idx = startAt; idx < len; idx++) {
-          if (this.objectAt(idx) === object) {
-            return idx;
-          }
-        }
-
         return -1;
       },
 
@@ -30196,14 +28589,13 @@ enifed("ember-runtime/mixins/array",
         from the end of the array. Returns -1 if no match is found.
 
         ```javascript
-        var arr = ['a', 'b', 'c', 'd', 'a'];
-
-        arr.lastIndexOf('a');       //  4
-        arr.lastIndexOf('z');       // -1
-        arr.lastIndexOf('a', 2);    //  0
-        arr.lastIndexOf('a', -1);   //  4
-        arr.lastIndexOf('b', 3);    //  1
-        arr.lastIndexOf('a', 100);  //  4
+        var arr = ["a", "b", "c", "d", "a"];
+        arr.lastIndexOf("a");       //  4
+        arr.lastIndexOf("z");       // -1
+        arr.lastIndexOf("a", 2);    //  0
+        arr.lastIndexOf("a", -1);   //  4
+        arr.lastIndexOf("b", 3);    //  1
+        arr.lastIndexOf("a", 100);  //  4
         ```
 
         @method lastIndexOf
@@ -30212,23 +28604,14 @@ enifed("ember-runtime/mixins/array",
         @return {Number} index or -1 if not found
       */
       lastIndexOf: function(object, startAt) {
-        var len = get(this, 'length');
-        var idx;
+        var idx, len = get(this, 'length');
 
-        if (startAt === undefined || startAt >= len) {
-          startAt = len-1;
+        if (startAt === undefined || startAt >= len) startAt = len-1;
+        if (startAt < 0) startAt += len;
+
+        for(idx = startAt; idx >= 0; idx--) {
+          if (this.objectAt(idx) === object) return idx;
         }
-
-        if (startAt < 0) {
-          startAt += len;
-        }
-
-        for (idx = startAt; idx >= 0; idx--) {
-          if (this.objectAt(idx) === object) {
-            return idx;
-          }
-        }
-
         return -1;
       },
 
@@ -30260,9 +28643,16 @@ enifed("ember-runtime/mixins/array",
           `willChange` and `didChange` option.
         @return {Ember.Array} receiver
       */
-
       addArrayObserver: function(target, opts) {
-        return arrayObserversHelper(this, target, opts, addListener, false);
+        var willChange = (opts && opts.willChange) || 'arrayWillChange',
+            didChange  = (opts && opts.didChange) || 'arrayDidChange';
+
+        var hasObservers = get(this, 'hasArrayObservers');
+        if (!hasObservers) propertyWillChange(this, 'hasArrayObservers');
+        addListener(this, '@array:before', target, willChange);
+        addListener(this, '@array:change', target, didChange);
+        if (!hasObservers) propertyDidChange(this, 'hasArrayObservers');
+        return this;
       },
 
       /**
@@ -30277,7 +28667,15 @@ enifed("ember-runtime/mixins/array",
         @return {Ember.Array} receiver
       */
       removeArrayObserver: function(target, opts) {
-        return arrayObserversHelper(this, target, opts, removeListener, true);
+        var willChange = (opts && opts.willChange) || 'arrayWillChange',
+            didChange  = (opts && opts.didChange) || 'arrayDidChange';
+
+        var hasObservers = get(this, 'hasArrayObservers');
+        if (hasObservers) propertyWillChange(this, 'hasArrayObservers');
+        removeListener(this, '@array:before', target, willChange);
+        removeListener(this, '@array:change', target, didChange);
+        if (hasObservers) propertyDidChange(this, 'hasArrayObservers');
+        return this;
       },
 
       /**
@@ -30305,36 +28703,26 @@ enifed("ember-runtime/mixins/array",
         @return {Ember.Array} receiver
       */
       arrayContentWillChange: function(startIdx, removeAmt, addAmt) {
-        var removing, lim;
 
         // if no args are passed assume everything changes
-        if (startIdx === undefined) {
+        if (startIdx===undefined) {
           startIdx = 0;
           removeAmt = addAmt = -1;
         } else {
-          if (removeAmt === undefined) {
-            removeAmt = -1;
-          }
-
-          if (addAmt === undefined) {
-            addAmt = -1;
-          }
+          if (removeAmt === undefined) removeAmt=-1;
+          if (addAmt    === undefined) addAmt=-1;
         }
 
         // Make sure the @each proxy is set up if anyone is observing @each
-        if (isWatching(this, '@each')) {
-          get(this, '@each');
-        }
+        if (isWatching(this, '@each')) { get(this, '@each'); }
 
         sendEvent(this, '@array:before', [this, startIdx, removeAmt, addAmt]);
 
-        if (startIdx >= 0 && removeAmt >= 0 && get(this, 'hasEnumerableObservers')) {
+        var removing, lim;
+        if (startIdx>=0 && removeAmt>=0 && get(this, 'hasEnumerableObservers')) {
           removing = [];
-          lim = startIdx + removeAmt;
-
-          for (var idx = startIdx; idx < lim; idx++) {
-            removing.push(this.objectAt(idx));
-          }
+          lim = startIdx+removeAmt;
+          for(var idx=startIdx;idx<lim;idx++) removing.push(this.objectAt(idx));
         } else {
           removing = removeAmt;
         }
@@ -30359,29 +28747,21 @@ enifed("ember-runtime/mixins/array",
         @return {Ember.Array} receiver
       */
       arrayContentDidChange: function(startIdx, removeAmt, addAmt) {
-        var adding, lim;
 
         // if no args are passed assume everything changes
-        if (startIdx === undefined) {
+        if (startIdx===undefined) {
           startIdx = 0;
           removeAmt = addAmt = -1;
         } else {
-          if (removeAmt === undefined) {
-            removeAmt = -1;
-          }
-
-          if (addAmt === undefined) {
-            addAmt = -1;
-          }
+          if (removeAmt === undefined) removeAmt=-1;
+          if (addAmt    === undefined) addAmt=-1;
         }
 
-        if (startIdx >= 0 && addAmt >= 0 && get(this, 'hasEnumerableObservers')) {
+        var adding, lim;
+        if (startIdx>=0 && addAmt>=0 && get(this, 'hasEnumerableObservers')) {
           adding = [];
-          lim = startIdx + addAmt;
-
-          for (var idx = startIdx; idx < lim; idx++) {
-            adding.push(this.objectAt(idx));
-          }
+          lim = startIdx+addAmt;
+          for(var idx=startIdx;idx<lim;idx++) adding.push(this.objectAt(idx));
         } else {
           adding = addAmt;
         }
@@ -30389,15 +28769,13 @@ enifed("ember-runtime/mixins/array",
         this.enumerableContentDidChange(removeAmt, adding);
         sendEvent(this, '@array:change', [this, startIdx, removeAmt, addAmt]);
 
-        var length = get(this, 'length');
-        var cachedFirst = cacheFor(this, 'firstObject');
-        var cachedLast = cacheFor(this, 'lastObject');
-
+        var length      = get(this, 'length'),
+            cachedFirst = cacheFor(this, 'firstObject'),
+            cachedLast  = cacheFor(this, 'lastObject');
         if (this.objectAt(0) !== cachedFirst) {
           propertyWillChange(this, 'firstObject');
           propertyDidChange(this, 'firstObject');
         }
-
         if (this.objectAt(length-1) !== cachedLast) {
           propertyWillChange(this, 'lastObject');
           propertyDidChange(this, 'lastObject');
@@ -30433,7 +28811,7 @@ enifed("ember-runtime/mixins/array",
       })
     });
   });
-enifed("ember-runtime/mixins/comparable",
+define("ember-runtime/mixins/comparable",
   ["ember-metal/mixin","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -30475,7 +28853,7 @@ enifed("ember-runtime/mixins/comparable",
       compare: required(Function)
     });
   });
-enifed("ember-runtime/mixins/controller",
+define("ember-runtime/mixins/controller",
   ["ember-metal/core","ember-metal/property_get","ember-runtime/system/object","ember-metal/mixin","ember-metal/computed","ember-runtime/mixins/action_handler","ember-runtime/mixins/controller_content_model_alias_deprecation","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
@@ -30539,11 +28917,22 @@ enifed("ember-runtime/mixins/controller",
       /**
         @private
        */
-      content: computed.alias('model')
+      content: computed.alias('model'),
 
+      deprecatedSendHandles: function(actionName) {
+        return !!this[actionName];
+      },
+
+      deprecatedSend: function(actionName) {
+        var args = [].slice.call(arguments, 1);
+        Ember.assert('' + this + " has the action " + actionName + " but it is not a function", typeof this[actionName] === 'function');
+        Ember.deprecate('Action handlers implemented directly on controllers are deprecated in favor of action handlers on an `actions` object ( action: `' + actionName + '` on ' + this + ')', false);
+        this[actionName].apply(this, args);
+        return;
+      }
     });
   });
-enifed("ember-runtime/mixins/controller_content_model_alias_deprecation",
+define("ember-runtime/mixins/controller_content_model_alias_deprecation",
   ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -30602,7 +28991,7 @@ enifed("ember-runtime/mixins/controller_content_model_alias_deprecation",
       }
     });
   });
-enifed("ember-runtime/mixins/copyable",
+define("ember-runtime/mixins/copyable",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-runtime/mixins/freezable","ember-runtime/system/string","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -30670,16 +29059,45 @@ enifed("ember-runtime/mixins/copyable",
       }
     });
   });
-enifed("ember-runtime/mixins/deferred",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","ember-metal/computed","ember-runtime/ext/rsvp","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+define("ember-runtime/mixins/deferred",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","ember-metal/computed","ember-metal/run_loop","ember-runtime/ext/rsvp","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.FEATURES, Ember.Test
     var get = __dependency2__.get;
     var Mixin = __dependency3__.Mixin;
     var computed = __dependency4__.computed;
-    var RSVP = __dependency5__["default"];
+    var run = __dependency5__["default"];
+    var RSVP = __dependency6__["default"];
+
+    var asyncStart = function() {
+      if (Ember.Test && Ember.Test.adapter) {
+        Ember.Test.adapter.asyncStart();
+      }
+    };
+
+    var asyncEnd = function() {
+      if (Ember.Test && Ember.Test.adapter) {
+        Ember.Test.adapter.asyncEnd();
+      }
+    };
+
+    RSVP.configure('async', function(callback, promise) {
+      var async = !run.currentRunLoop;
+
+      if (Ember.testing && async) { asyncStart(); }
+
+      run.backburner.schedule('actions', function(){
+        if (Ember.testing && async) { asyncEnd(); }
+        callback(promise);
+      });
+    });
+
+    RSVP.Promise.prototype.fail = function(callback, label){
+      Ember.deprecate('RSVP.Promise.fail has been renamed as RSVP.Promise.catch');
+      return this['catch'](callback, label);
+    };
 
     /**
     @module ember
@@ -30751,7 +29169,7 @@ enifed("ember-runtime/mixins/deferred",
       })
     });
   });
-enifed("ember-runtime/mixins/enumerable",
+define("ember-runtime/mixins/enumerable",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/property_events","ember-metal/events","ember-runtime/compare","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
@@ -31102,7 +29520,7 @@ enifed("ember-runtime/mixins/enumerable",
         - `index` is the current index in the iteration.
         - `enumerable` is the enumerable object itself.
 
-        It should return `true` to include the item in the results, `false`
+        It should return the `true` to include the item in the results, `false`
         otherwise.
 
         Note that in addition to a callback, you can also pass an optional target
@@ -31192,9 +29610,9 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Array} rejected array
       */
       rejectBy: function(key, value) {
-        var exactValue = function(item) { return get(item, key) === value; };
-        var hasValue = function(item) { return !!get(item, key); };
-        var use = (arguments.length === 2 ? exactValue : hasValue);
+        var exactValue = function(item) { return get(item, key) === value; },
+            hasValue = function(item) { return !!get(item, key); },
+            use = (arguments.length === 2 ? exactValue : hasValue);
 
         return this.reject(use);
       },
@@ -31391,11 +29809,11 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Boolean} `true` if the passed function returns `true` for any item
       */
       any: function(callback, target) {
-        var len     = get(this, 'length');
-        var context = popCtx();
-        var found   = false;
-        var last    = null;
-        var next, idx;
+        var len     = get(this, 'length'),
+            context = popCtx(),
+            found   = false,
+            last    = null,
+            next, idx;
 
         if (target === undefined) { target = null; }
 
@@ -31648,10 +30066,10 @@ enifed("ember-runtime/mixins/enumerable",
         @return this
       */
       addEnumerableObserver: function(target, opts) {
-        var willChange = (opts && opts.willChange) || 'enumerableWillChange';
-        var didChange  = (opts && opts.didChange) || 'enumerableDidChange';
-        var hasObservers = get(this, 'hasEnumerableObservers');
+        var willChange = (opts && opts.willChange) || 'enumerableWillChange',
+            didChange  = (opts && opts.didChange) || 'enumerableDidChange';
 
+        var hasObservers = get(this, 'hasEnumerableObservers');
         if (!hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
         addListener(this, '@enumerable:before', target, willChange);
         addListener(this, '@enumerable:change', target, didChange);
@@ -31668,8 +30086,8 @@ enifed("ember-runtime/mixins/enumerable",
         @return this
       */
       removeEnumerableObserver: function(target, opts) {
-        var willChange = (opts && opts.willChange) || 'enumerableWillChange';
-        var didChange  = (opts && opts.didChange) || 'enumerableDidChange';
+        var willChange = (opts && opts.willChange) || 'enumerableWillChange',
+            didChange  = (opts && opts.didChange) || 'enumerableDidChange';
 
         var hasObservers = get(this, 'hasEnumerableObservers');
         if (hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
@@ -31779,9 +30197,9 @@ enifed("ember-runtime/mixins/enumerable",
         var sortKeys = arguments;
         return this.toArray().sort(function(a, b){
           for(var i = 0; i < sortKeys.length; i++) {
-            var key = sortKeys[i];
-            var propA = get(a, key);
-            var propB = get(b, key);
+            var key = sortKeys[i],
+            propA = get(a, key),
+            propB = get(b, key);
             // return 1 or -1 else continue to the next sortKey
             var compareValue = compare(propA, propB);
             if (compareValue) { return compareValue; }
@@ -31791,7 +30209,7 @@ enifed("ember-runtime/mixins/enumerable",
       }
     });
   });
-enifed("ember-runtime/mixins/evented",
+define("ember-runtime/mixins/evented",
   ["ember-metal/mixin","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -31948,7 +30366,7 @@ enifed("ember-runtime/mixins/evented",
       }
     });
   });
-enifed("ember-runtime/mixins/freezable",
+define("ember-runtime/mixins/freezable",
   ["ember-metal/mixin","ember-metal/property_get","ember-metal/property_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -32046,7 +30464,7 @@ enifed("ember-runtime/mixins/freezable",
     var FROZEN_ERROR = "Frozen object cannot be modified.";
     __exports__.FROZEN_ERROR = FROZEN_ERROR;
   });
-enifed("ember-runtime/mixins/mutable_array",
+define("ember-runtime/mixins/mutable_array",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/mixin","ember-runtime/mixins/array","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/enumerable","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -32330,7 +30748,7 @@ enifed("ember-runtime/mixins/mutable_array",
       },
 
       /**
-        Replace all the receiver's content with content of the argument.
+        Replace all the the receiver's content with content of the argument.
         If argument is an empty array receiver will be cleared.
 
         ```javascript
@@ -32400,7 +30818,7 @@ enifed("ember-runtime/mixins/mutable_array",
 
     });
   });
-enifed("ember-runtime/mixins/mutable_enumerable",
+define("ember-runtime/mixins/mutable_enumerable",
   ["ember-metal/enumerable_utils","ember-runtime/mixins/enumerable","ember-metal/mixin","ember-metal/property_events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -32521,7 +30939,7 @@ enifed("ember-runtime/mixins/mutable_enumerable",
       }
     });
   });
-enifed("ember-runtime/mixins/observable",
+define("ember-runtime/mixins/observable",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/get_properties","ember-metal/set_properties","ember-metal/mixin","ember-metal/events","ember-metal/property_events","ember-metal/observer","ember-metal/computed","ember-metal/is_none","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
@@ -32663,7 +31081,7 @@ enifed("ember-runtime/mixins/observable",
       },
 
       /**
-        To get the values of multiple properties at once, call `getProperties`
+        To get multiple properties at once, call `getProperties`
         with a list of strings or an array:
 
         ```javascript
@@ -33031,12 +31449,12 @@ enifed("ember-runtime/mixins/observable",
       }
     });
   });
-enifed("ember-runtime/mixins/promise_proxy",
-  ["ember-metal/property_get","ember-metal/set_properties","ember-metal/computed","ember-metal/mixin","ember-metal/error","exports"],
+define("ember-runtime/mixins/promise_proxy",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/mixin","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var get = __dependency1__.get;
-    var setProperties = __dependency2__["default"];
+    var set = __dependency2__.set;
     var computed = __dependency3__.computed;
     var Mixin = __dependency4__.Mixin;
     var EmberError = __dependency5__["default"];
@@ -33050,22 +31468,16 @@ enifed("ember-runtime/mixins/promise_proxy",
      */
 
     function tap(proxy, promise) {
-      setProperties(proxy, {
-        isFulfilled: false,
-        isRejected: false
-      });
+      set(proxy, 'isFulfilled', false);
+      set(proxy, 'isRejected', false);
 
       return promise.then(function(value) {
-        setProperties(proxy, {
-          content: value,
-          isFulfilled: true
-        });
+        set(proxy, 'isFulfilled', true);
+        set(proxy, 'content', value);
         return value;
       }, function(reason) {
-        setProperties(proxy, {
-          reason: reason,
-          isRejected: true
-        });
+        set(proxy, 'isRejected', true);
+        set(proxy, 'reason', reason);
         throw reason;
       }, "Ember: PromiseProxy");
     }
@@ -33245,7 +31657,7 @@ enifed("ember-runtime/mixins/promise_proxy",
       };
     }
   });
-enifed("ember-runtime/mixins/sortable",
+define("ember-runtime/mixins/sortable",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-runtime/mixins/mutable_enumerable","ember-runtime/compare","ember-metal/observer","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -33367,10 +31779,10 @@ enifed("ember-runtime/mixins/sortable",
       sortFunction: compare,
 
       orderBy: function(item1, item2) {
-        var result = 0;
-        var sortProperties = get(this, 'sortProperties');
-        var sortAscending = get(this, 'sortAscending');
-        var sortFunction = get(this, 'sortFunction');
+        var result = 0,
+            sortProperties = get(this, 'sortProperties'),
+            sortAscending = get(this, 'sortAscending'),
+            sortFunction = get(this, 'sortFunction');
 
         Ember.assert("you need to define `sortProperties`", !!sortProperties);
 
@@ -33387,8 +31799,8 @@ enifed("ember-runtime/mixins/sortable",
       },
 
       destroy: function() {
-        var content = get(this, 'content');
-        var sortProperties = get(this, 'sortProperties');
+        var content = get(this, 'content'),
+            sortProperties = get(this, 'sortProperties');
 
         if (content && sortProperties) {
           forEach(content, function(item) {
@@ -33411,10 +31823,10 @@ enifed("ember-runtime/mixins/sortable",
       */
 
       arrangedContent: computed('content', 'sortProperties.@each', function(key, value) {
-        var content = get(this, 'content');
-        var isSorted = get(this, 'isSorted');
-        var sortProperties = get(this, 'sortProperties');
-        var self = this;
+        var content = get(this, 'content'),
+            isSorted = get(this, 'isSorted'),
+            sortProperties = get(this, 'sortProperties'),
+            self = this;
 
         if (content && isSorted) {
           content = content.slice();
@@ -33433,8 +31845,8 @@ enifed("ember-runtime/mixins/sortable",
       }),
 
       _contentWillChange: beforeObserver('content', function() {
-        var content = get(this, 'content');
-        var sortProperties = get(this, 'sortProperties');
+        var content = get(this, 'content'),
+            sortProperties = get(this, 'sortProperties');
 
         if (content && sortProperties) {
           forEach(content, function(item) {
@@ -33487,8 +31899,8 @@ enifed("ember-runtime/mixins/sortable",
       },
 
       contentArrayDidChange: function(array, idx, removedCount, addedCount) {
-        var isSorted = get(this, 'isSorted');
-        var sortProperties = get(this, 'sortProperties');
+        var isSorted = get(this, 'isSorted'),
+            sortProperties = get(this, 'sortProperties');
 
         if (isSorted) {
           var addedObjects = array.slice(idx, idx+addedCount);
@@ -33514,12 +31926,12 @@ enifed("ember-runtime/mixins/sortable",
       },
 
       contentItemSortPropertyDidChange: function(item) {
-        var arrangedContent = get(this, 'arrangedContent');
-        var oldIndex = arrangedContent.indexOf(item);
-        var leftItem = arrangedContent.objectAt(oldIndex - 1);
-        var rightItem = arrangedContent.objectAt(oldIndex + 1);
-        var leftResult = leftItem && this.orderBy(item, leftItem);
-        var rightResult = rightItem && this.orderBy(item, rightItem);
+        var arrangedContent = get(this, 'arrangedContent'),
+            oldIndex = arrangedContent.indexOf(item),
+            leftItem = arrangedContent.objectAt(oldIndex - 1),
+            rightItem = arrangedContent.objectAt(oldIndex + 1),
+            leftResult = leftItem && this.orderBy(item, leftItem),
+            rightResult = rightItem && this.orderBy(item, rightItem);
 
         if (leftResult < 0 || rightResult > 0) {
           arrangedContent.removeObject(item);
@@ -33551,7 +31963,7 @@ enifed("ember-runtime/mixins/sortable",
       }
     });
   });
-enifed("ember-runtime/mixins/target_action_support",
+define("ember-runtime/mixins/target_action_support",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/mixin","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -33665,9 +32077,9 @@ enifed("ember-runtime/mixins/target_action_support",
       */
       triggerAction: function(opts) {
         opts = opts || {};
-        var action = opts.action || get(this, 'action');
-        var target = opts.target || get(this, 'targetObject');
-        var actionContext = opts.actionContext;
+        var action = opts.action || get(this, 'action'),
+            target = opts.target || get(this, 'targetObject'),
+            actionContext = opts.actionContext;
 
         function args(options, actionName) {
           var ret = [];
@@ -33701,7 +32113,7 @@ enifed("ember-runtime/mixins/target_action_support",
 
     __exports__["default"] = TargetActionSupport;
   });
-enifed("ember-runtime/system/application",
+define("ember-runtime/system/application",
   ["ember-runtime/system/namespace","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -33709,7 +32121,7 @@ enifed("ember-runtime/system/application",
 
     __exports__["default"] = Namespace.extend();
   });
-enifed("ember-runtime/system/array_proxy",
+define("ember-runtime/system/array_proxy",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/property_events","ember-metal/error","ember-runtime/system/object","ember-runtime/mixins/mutable_array","ember-runtime/mixins/enumerable","ember-runtime/system/string","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
@@ -33853,28 +32265,7 @@ enifed("ember-runtime/system/array_proxy",
         }
       },
 
-      /**
-        Override to implement content array `willChange` observer.
-
-        @method contentArrayWillChange
-
-        @param {Ember.Array} contentArray the content array
-        @param {Number} start starting index of the change
-        @param {Number} removeCount count of items removed
-        @param {Number} addCount count of items added
-
-      */
       contentArrayWillChange: K,
-      /**
-        Override to implement content array `didChange` observer.
-
-        @method contentArrayDidChange
-
-        @param {Ember.Array} contentArray the content array
-        @param {Number} start starting index of the change
-        @param {Number} removeCount count of items removed
-        @param {Number} addCount count of items added
-      */
       contentArrayDidChange: K,
 
       /**
@@ -33908,8 +32299,8 @@ enifed("ember-runtime/system/array_proxy",
       },
 
       _arrangedContentWillChange: beforeObserver('arrangedContent', function() {
-        var arrangedContent = get(this, 'arrangedContent');
-        var len = arrangedContent ? get(arrangedContent, 'length') : 0;
+        var arrangedContent = get(this, 'arrangedContent'),
+            len = arrangedContent ? get(arrangedContent, 'length') : 0;
 
         this.arrangedContentArrayWillChange(this, 0, len, undefined);
         this.arrangedContentWillChange(this);
@@ -33918,8 +32309,8 @@ enifed("ember-runtime/system/array_proxy",
       }),
 
       _arrangedContentDidChange: observer('arrangedContent', function() {
-        var arrangedContent = get(this, 'arrangedContent');
-        var len = arrangedContent ? get(arrangedContent, 'length') : 0;
+        var arrangedContent = get(this, 'arrangedContent'),
+            len = arrangedContent ? get(arrangedContent, 'length') : 0;
 
         Ember.assert("Can't set ArrayProxy's content to itself", arrangedContent !== this);
 
@@ -33999,10 +32390,9 @@ enifed("ember-runtime/system/array_proxy",
 
       removeAt: function(start, len) {
         if ('number' === typeof start) {
-          var content = get(this, 'content');
-          var arrangedContent = get(this, 'arrangedContent');
-          var indices = [];
-          var i;
+          var content = get(this, 'content'),
+              arrangedContent = get(this, 'arrangedContent'),
+              indices = [], i;
 
           if ((start < 0) || (start >= get(this, 'length'))) {
             throw new EmberError(OUT_OF_RANGE_EXCEPTION);
@@ -34087,7 +32477,7 @@ enifed("ember-runtime/system/array_proxy",
 
     __exports__["default"] = ArrayProxy;
   });
-enifed("ember-runtime/system/container",
+define("ember-runtime/system/container",
   ["ember-metal/property_set","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -34098,8 +32488,8 @@ enifed("ember-runtime/system/container",
 
     __exports__["default"] = Container;
   });
-enifed("ember-runtime/system/core_object",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/platform","ember-metal/watching","ember-metal/chains","ember-metal/events","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/error","ember-metal/keys","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/binding","ember-metal/computed","ember-metal/run_loop","exports"],
+define("ember-runtime/system/core_object",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/platform","ember-metal/watching","ember-metal/chains","ember-metal/events","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/error","ember-runtime/keys","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/binding","ember-metal/computed","ember-metal/run_loop","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
         // Remove "use strict"; from transpiled module until
     // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
@@ -34112,7 +32502,7 @@ enifed("ember-runtime/system/core_object",
     */
 
     var Ember = __dependency1__["default"];
-    // Ember.assert, Ember.K, Ember.config
+    // Ember.ENV.MANDATORY_SETTER, Ember.assert, Ember.K, Ember.config
 
     // NOTE: this object should never be included directly. Instead use `Ember.Object`.
     // We only define this separately so that `Ember.Set` can depend on it.
@@ -34124,6 +32514,7 @@ enifed("ember-runtime/system/core_object",
     var generateGuid = __dependency4__.generateGuid;
     var GUID_KEY = __dependency4__.GUID_KEY;
     var meta = __dependency4__.meta;
+    var META_KEY = __dependency4__.META_KEY;
     var makeArray = __dependency4__.makeArray;
     var rewatch = __dependency6__.rewatch;
     var finishChains = __dependency7__.finishChains;
@@ -34133,7 +32524,7 @@ enifed("ember-runtime/system/core_object",
     var required = __dependency9__.required;
     var indexOf = __dependency10__.indexOf;
     var EmberError = __dependency11__["default"];
-    var o_defineProperty = __dependency5__.defineProperty;
+    var platform = __dependency5__.platform;
     var keys = __dependency12__["default"];
     var ActionHandler = __dependency13__["default"];
     var defineProperty = __dependency14__.defineProperty;
@@ -34141,13 +32532,14 @@ enifed("ember-runtime/system/core_object",
     var ComputedProperty = __dependency16__.ComputedProperty;
     var run = __dependency17__["default"];
     var destroy = __dependency6__.destroy;
-    var K = __dependency1__.K;
-    var hasPropertyAccessors = __dependency5__.hasPropertyAccessors;
 
+    var K = __dependency1__.K;
+    var o_defineProperty = platform.defineProperty;
     var schedule = run.schedule;
     var applyMixin = Mixin._apply;
     var finishPartial = Mixin.finishPartial;
     var reopen = Mixin.prototype.reopen;
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
     var hasCachedComputedProperties = false;
 
     var undefinedDescriptor = {
@@ -34170,8 +32562,7 @@ enifed("ember-runtime/system/core_object",
       // method a lot faster. This is glue code so we want it to be as fast as
       // possible.
 
-      var wasApplied = false;
-      var initMixins, initProperties;
+      var wasApplied = false, initMixins, initProperties;
 
       var Class = function() {
         if (!wasApplied) {
@@ -34179,8 +32570,7 @@ enifed("ember-runtime/system/core_object",
         }
         o_defineProperty(this, GUID_KEY, nullDescriptor);
         o_defineProperty(this, '__nextSuper', undefinedDescriptor);
-        var m = meta(this);
-        var proto = m.proto;
+        var m = meta(this), proto = m.proto;
         m.proto = this;
         if (initMixins) {
           // capture locally so we can clear the closed over variable
@@ -34251,14 +32641,11 @@ enifed("ember-runtime/system/core_object",
               } else {
                 if (typeof this.setUnknownProperty === 'function' && !(keyName in this)) {
                   this.setUnknownProperty(keyName, value);
+                } else if (MANDATORY_SETTER) {
+                  defineProperty(this, keyName, null, value); // setup mandatory setter
                 } else {
-                  
-                    if (hasPropertyAccessors) {
-                      defineProperty(this, keyName, null, value); // setup mandatory setter
-                    } else {
-                      this[keyName] = value;
-                    }
-                                  }
+                  this[keyName] = value;
+                }
               }
             }
           }
@@ -34309,6 +32696,7 @@ enifed("ember-runtime/system/core_object",
     */
     var CoreObject = makeCtor();
     CoreObject.toString = function() { return "Ember.CoreObject"; };
+
     CoreObject.PrototypeMixin = Mixin.create({
       reopen: function() {
         var length = arguments.length;
@@ -34525,10 +32913,9 @@ enifed("ember-runtime/system/core_object",
         @return {String} string representation
       */
       toString: function toString() {
-        var hasToStringExtension = typeof this.toStringExtension === 'function';
-        var extension = hasToStringExtension ? ":" + this.toStringExtension() : '';
+        var hasToStringExtension = typeof this.toStringExtension === 'function',
+            extension = hasToStringExtension ? ":" + this.toStringExtension() : '';
         var ret = '<'+this.constructor.toString()+':'+guidFor(this)+extension+'>';
-
         this.toString = makeToString(ret);
         return ret;
       }
@@ -34636,9 +33023,8 @@ enifed("ember-runtime/system/core_object",
         @param {Mixin} [mixins]* One or more Mixin classes
         @param {Object} [arguments]* Object containing values to use within the new class
       */
-      extend: function extend() {
-        var Class = makeCtor();
-        var proto;
+      extend: function() {
+        var Class = makeCtor(), proto;
         Class.ClassMixin = Mixin.create(this.ClassMixin);
         Class.PrototypeMixin = Mixin.create(this.PrototypeMixin);
 
@@ -34884,8 +33270,8 @@ enifed("ember-runtime/system/core_object",
         @param key {String} property name
       */
       metaForProperty: function(key) {
-        var meta = this.proto()['__ember_meta__'];
-        var desc = meta && meta.descs[key];
+        var meta = this.proto()[META_KEY],
+            desc = meta && meta.descs[key];
 
         Ember.assert("metaForProperty() could not find a computed property with key '"+key+"'.", !!desc && desc instanceof ComputedProperty);
         return desc._meta || {};
@@ -34953,12 +33339,15 @@ enifed("ember-runtime/system/core_object",
             cache._computedProperties = undefined;
           }
         }
+
+        this._super();
       }
     });
 
+
     __exports__["default"] = CoreObject;
   });
-enifed("ember-runtime/system/deferred",
+define("ember-runtime/system/deferred",
   ["ember-metal/core","ember-runtime/mixins/deferred","ember-metal/property_get","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -34984,7 +33373,7 @@ enifed("ember-runtime/system/deferred",
 
     __exports__["default"] = Deferred;
   });
-enifed("ember-runtime/system/each_proxy",
+define("ember-runtime/system/each_proxy",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/enumerable_utils","ember-metal/array","ember-runtime/mixins/array","ember-runtime/system/object","ember-metal/computed","ember-metal/observer","ember-metal/events","ember-metal/properties","ember-metal/property_events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
     "use strict";
@@ -35042,8 +33431,7 @@ enifed("ember-runtime/system/each_proxy",
     var IS_OBSERVER = /^.+:(before|change)$/;
 
     function addObserverForContentKey(content, keyName, proxy, idx, loc) {
-      var objects = proxy._objects;
-      var guid;
+      var objects = proxy._objects, guid;
       if (!objects) objects = proxy._objects = {};
 
       while(--loc>=idx) {
@@ -35125,8 +33513,7 @@ enifed("ember-runtime/system/each_proxy",
       // Invokes whenever the content array itself changes.
 
       arrayWillChange: function(content, idx, removedCnt, addedCnt) {
-        var keys = this._keys;
-        var key, lim;
+        var keys = this._keys, key, lim;
 
         lim = removedCnt>0 ? idx+removedCnt : -1;
         beginPropertyChanges(this);
@@ -35144,8 +33531,7 @@ enifed("ember-runtime/system/each_proxy",
       },
 
       arrayDidChange: function(content, idx, removedCnt, addedCnt) {
-        var keys = this._keys;
-        var lim;
+        var keys = this._keys, lim;
 
         lim = addedCnt>0 ? idx+addedCnt : -1;
         changeProperties(function() {
@@ -35186,9 +33572,8 @@ enifed("ember-runtime/system/each_proxy",
         if (!keys) keys = this._keys = {};
         if (!keys[keyName]) {
           keys[keyName] = 1;
-          var content = this._content;
-          var len = get(content, 'length');
-
+          var content = this._content,
+              len = get(content, 'length');
           addObserverForContentKey(content, keyName, this, 0, len);
         } else {
           keys[keyName]++;
@@ -35198,9 +33583,8 @@ enifed("ember-runtime/system/each_proxy",
       stopObservingContentKey: function(keyName) {
         var keys = this._keys;
         if (keys && (keys[keyName]>0) && (--keys[keyName]<=0)) {
-          var content = this._content;
-          var len     = get(content, 'length');
-
+          var content = this._content,
+              len     = get(content, 'length');
           removeObserverForContentKey(content, keyName, this, 0, len);
         }
       },
@@ -35217,7 +33601,7 @@ enifed("ember-runtime/system/each_proxy",
     __exports__.EachArray = EachArray;
     __exports__.EachProxy = EachProxy;
   });
-enifed("ember-runtime/system/lazy_load",
+define("ember-runtime/system/lazy_load",
   ["ember-metal/core","ember-metal/array","ember-runtime/system/native_array","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -35291,7 +33675,7 @@ enifed("ember-runtime/system/lazy_load",
 
     __exports__.runLoadHooks = runLoadHooks;
   });
-enifed("ember-runtime/system/namespace",
+define("ember-runtime/system/namespace",
   ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/utils","ember-metal/mixin","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -35336,7 +33720,7 @@ enifed("ember-runtime/system/namespace",
       },
 
       toString: function() {
-        var name = get(this, 'name') || get(this, 'modulePrefix');
+        var name = get(this, 'name');
         if (name) { return name; }
 
         findNamespaces();
@@ -35348,8 +33732,8 @@ enifed("ember-runtime/system/namespace",
       },
 
       destroy: function() {
-        var namespaces = Namespace.NAMESPACES;
-        var toString = this.toString();
+        var namespaces = Namespace.NAMESPACES,
+            toString = this.toString();
 
         if (toString) {
           Ember.lookup[toString] = undefined;
@@ -35428,8 +33812,7 @@ enifed("ember-runtime/system/namespace",
     }
 
     function findNamespaces() {
-      var lookup = Ember.lookup;
-      var obj, isNamespace;
+      var lookup = Ember.lookup, obj, isNamespace;
 
       if (Namespace.PROCESSED) { return; }
 
@@ -35486,8 +33869,8 @@ enifed("ember-runtime/system/namespace",
     }
 
     function processAllNamespaces() {
-      var unprocessedNamespaces = !Namespace.PROCESSED;
-      var unprocessedMixins = Ember.anyUnprocessedMixins;
+      var unprocessedNamespaces = !Namespace.PROCESSED,
+          unprocessedMixins = Ember.anyUnprocessedMixins;
 
       if (unprocessedNamespaces) {
         findNamespaces();
@@ -35495,9 +33878,7 @@ enifed("ember-runtime/system/namespace",
       }
 
       if (unprocessedNamespaces || unprocessedMixins) {
-        var namespaces = Namespace.NAMESPACES;
-        var namespace;
-
+        var namespaces = Namespace.NAMESPACES, namespace;
         for (var i=0, l=namespaces.length; i<l; i++) {
           namespace = namespaces[i];
           processNamespace([namespace.toString()], namespace, {});
@@ -35515,9 +33896,9 @@ enifed("ember-runtime/system/namespace",
 
     __exports__["default"] = Namespace;
   });
-enifed("ember-runtime/system/native_array",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-metal/array","ember-runtime/mixins/array","ember-runtime/mixins/mutable_array","ember-runtime/mixins/observable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-runtime/copy","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+define("ember-runtime/system/native_array",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-runtime/mixins/array","ember-runtime/mixins/mutable_array","ember-runtime/mixins/observable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-runtime/copy","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -35532,14 +33913,12 @@ enifed("ember-runtime/system/native_array",
     var replace = __dependency4__._replace;
     var forEach = __dependency4__.forEach;
     var Mixin = __dependency5__.Mixin;
-    var indexOf = __dependency6__.indexOf;
-    var lastIndexOf = __dependency6__.lastIndexOf;
-    var EmberArray = __dependency7__["default"];
-    var MutableArray = __dependency8__["default"];
-    var Observable = __dependency9__["default"];
-    var Copyable = __dependency10__["default"];
-    var FROZEN_ERROR = __dependency11__.FROZEN_ERROR;
-    var copy = __dependency12__["default"];
+    var EmberArray = __dependency6__["default"];
+    var MutableArray = __dependency7__["default"];
+    var Observable = __dependency8__["default"];
+    var Copyable = __dependency9__["default"];
+    var FROZEN_ERROR = __dependency10__.FROZEN_ERROR;
+    var copy = __dependency11__["default"];
 
     // Add Ember.Array to Array.prototype. Remove methods with native
     // implementations and supply some more optimized versions of generic methods
@@ -35597,15 +33976,39 @@ enifed("ember-runtime/system/native_array",
       // from member items.
       unknownProperty: function(key, value) {
         var ret;// = this.reducedProperty(key, value) ;
-        if (value !== undefined && ret === undefined) {
+        if ((value !== undefined) && ret === undefined) {
           ret = this[key] = value;
         }
-        return ret;
+        return ret ;
       },
 
-      indexOf: indexOf,
+      // If browser did not implement indexOf natively, then override with
+      // specialized version
+      indexOf: function(object, startAt) {
+        var idx, len = this.length;
 
-      lastIndexOf: lastIndexOf,
+        if (startAt === undefined) startAt = 0;
+        else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
+        if (startAt < 0) startAt += len;
+
+        for(idx=startAt;idx<len;idx++) {
+          if (this[idx] === object) return idx ;
+        }
+        return -1;
+      },
+
+      lastIndexOf: function(object, startAt) {
+        var idx, len = this.length;
+
+        if (startAt === undefined) startAt = len-1;
+        else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
+        if (startAt < 0) startAt += len;
+
+        for(idx=startAt;idx>=0;idx--) {
+          if (this[idx] === object) return idx ;
+        }
+        return -1;
+      },
 
       copy: function(deep) {
         if (deep) {
@@ -35622,7 +34025,7 @@ enifed("ember-runtime/system/native_array",
       if (Array.prototype[methodName]) ignore.push(methodName);
     });
 
-    if (ignore.length > 0) {
+    if (ignore.length>0) {
       NativeArray = NativeArray.without.apply(NativeArray, ignore);
     }
 
@@ -35693,7 +34096,7 @@ enifed("ember-runtime/system/native_array",
     __exports__.NativeArray = NativeArray;
     __exports__["default"] = NativeArray;
   });
-enifed("ember-runtime/system/object",
+define("ember-runtime/system/object",
   ["ember-runtime/system/core_object","ember-runtime/mixins/observable","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -35722,12 +34125,42 @@ enifed("ember-runtime/system/object",
 
     __exports__["default"] = EmberObject;
   });
-enifed("ember-runtime/system/object_proxy",
-  ["ember-runtime/system/object","ember-runtime/mixins/-proxy","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+define("ember-runtime/system/object_proxy",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/observer","ember-metal/property_events","ember-metal/computed","ember-metal/properties","ember-metal/mixin","ember-runtime/system/string","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
-    var EmberObject = __dependency1__["default"];
-    var _ProxyMixin = __dependency2__["default"];
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var meta = __dependency4__.meta;
+    var addObserver = __dependency5__.addObserver;
+    var removeObserver = __dependency5__.removeObserver;
+    var addBeforeObserver = __dependency5__.addBeforeObserver;
+    var removeBeforeObserver = __dependency5__.removeBeforeObserver;
+    var propertyWillChange = __dependency6__.propertyWillChange;
+    var propertyDidChange = __dependency6__.propertyDidChange;
+    var computed = __dependency7__.computed;
+    var defineProperty = __dependency8__.defineProperty;
+    var observer = __dependency9__.observer;
+    var fmt = __dependency10__.fmt;
+    var EmberObject = __dependency11__["default"];
+
+    function contentPropertyWillChange(content, contentKey) {
+      var key = contentKey.slice(8); // remove "content."
+      if (key in this) { return; }  // if shadowed in proxy
+      propertyWillChange(this, key);
+    }
+
+    function contentPropertyDidChange(content, contentKey) {
+      var key = contentKey.slice(8); // remove "content."
+      if (key in this) { return; } // if shadowed in proxy
+      propertyDidChange(this, key);
+    }
 
     /**
       `Ember.ObjectProxy` forwards all properties not defined by the proxy itself
@@ -35795,12 +34228,62 @@ enifed("ember-runtime/system/object_proxy",
       @class ObjectProxy
       @namespace Ember
       @extends Ember.Object
-      @extends Ember._ProxyMixin
     */
+    var ObjectProxy = EmberObject.extend({
+      /**
+        The object whose properties will be forwarded.
 
-    __exports__["default"] = EmberObject.extend(_ProxyMixin);
+        @property content
+        @type Ember.Object
+        @default null
+      */
+      content: null,
+      _contentDidChange: observer('content', function() {
+        Ember.assert("Can't set ObjectProxy's content to itself", get(this, 'content') !== this);
+      }),
+
+      isTruthy: computed.bool('content'),
+
+      _debugContainerKey: null,
+
+      willWatchProperty: function (key) {
+        var contentKey = 'content.' + key;
+        addBeforeObserver(this, contentKey, null, contentPropertyWillChange);
+        addObserver(this, contentKey, null, contentPropertyDidChange);
+      },
+
+      didUnwatchProperty: function (key) {
+        var contentKey = 'content.' + key;
+        removeBeforeObserver(this, contentKey, null, contentPropertyWillChange);
+        removeObserver(this, contentKey, null, contentPropertyDidChange);
+      },
+
+      unknownProperty: function (key) {
+        var content = get(this, 'content');
+        if (content) {
+          return get(content, key);
+        }
+      },
+
+      setUnknownProperty: function (key, value) {
+        var m = meta(this);
+        if (m.proto === this) {
+          // if marked as prototype then just defineProperty
+          // rather than delegate
+          defineProperty(this, key, null, value);
+          return value;
+        }
+
+        var content = get(this, 'content');
+        Ember.assert(fmt("Cannot delegate set('%@', %@) to the 'content' property of object proxy %@: its 'content' is undefined.", [key, value, this]), content);
+        return set(content, key, value);
+      }
+
+    });
+
+    __exports__["default"] = ObjectProxy;
   });
-enifed("ember-runtime/system/set",
+define("ember-runtime/system/set",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/is_none","ember-runtime/system/string","ember-runtime/system/core_object","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/enumerable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-metal/error","ember-metal/property_events","ember-metal/mixin","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
     "use strict";
@@ -35809,7 +34292,7 @@ enifed("ember-runtime/system/set",
     @submodule ember-runtime
     */
     var Ember = __dependency1__["default"];
-    // Ember.isNone, Ember.A
+    // Ember.isNone
 
     var get = __dependency2__.get;
     var set = __dependency3__.set;
@@ -36161,7 +34644,6 @@ enifed("ember-runtime/system/set",
       //
 
       init: function(items) {
-        Ember.deprecate('Ember.Set is deprecated and will be removed in a future release.');
         this._super();
         if (items) this.addObjects(items);
       },
@@ -36186,10 +34668,10 @@ enifed("ember-runtime/system/set",
         if (get(this, 'isFrozen')) throw new EmberError(FROZEN_ERROR);
         if (isNone(obj)) return this; // nothing to do
 
-        var guid = guidFor(obj);
-        var idx  = this[guid];
-        var len  = get(this, 'length');
-        var added;
+        var guid = guidFor(obj),
+            idx  = this[guid],
+            len  = get(this, 'length'),
+            added ;
 
         if (idx>=0 && idx<len && (this[idx] === obj)) return this; // added
 
@@ -36214,12 +34696,12 @@ enifed("ember-runtime/system/set",
         if (get(this, 'isFrozen')) throw new EmberError(FROZEN_ERROR);
         if (isNone(obj)) return this; // nothing to do
 
-        var guid = guidFor(obj);
-        var idx  = this[guid];
-        var len = get(this, 'length');
-        var isFirst = idx === 0;
-        var isLast = idx === len-1;
-        var last, removed;
+        var guid = guidFor(obj),
+            idx  = this[guid],
+            len = get(this, 'length'),
+            isFirst = idx === 0,
+            isLast = idx === len-1,
+            last, removed;
 
 
         if (idx>=0 && idx<len && (this[idx] === obj)) {
@@ -36272,9 +34754,9 @@ enifed("ember-runtime/system/set",
       }
     });
   });
-enifed("ember-runtime/system/string",
-  ["ember-metal/core","ember-metal/utils","ember-metal/cache","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+define("ember-runtime/system/string",
+  ["ember-metal/core","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -36285,68 +34767,23 @@ enifed("ember-runtime/system/string",
     var isArray = __dependency2__.isArray;
     var emberInspect = __dependency2__.inspect;
 
-    var Cache = __dependency3__["default"];
-
     var STRING_DASHERIZE_REGEXP = (/[ _]/g);
-
-    var STRING_DASHERIZE_CACHE = new Cache(1000, function(key) {
-      return decamelize(key).replace(STRING_DASHERIZE_REGEXP, '-');
-    });
-
-    var CAMELIZE_CACHE = new Cache(1000, function(key) {
-      return key.replace(STRING_CAMELIZE_REGEXP, function(match, separator, chr) {
-        return chr ? chr.toUpperCase() : '';
-      }).replace(/^([A-Z])/, function(match, separator, chr) {
-        return match.toLowerCase();
-      });
-    });
-
-    var CLASSIFY_CACHE = new Cache(1000, function(str) {
-      var parts = str.split(".");
-      var out = [];
-
-      for (var i=0, l=parts.length; i<l; i++) {
-        var camelized = camelize(parts[i]);
-        out.push(camelized.charAt(0).toUpperCase() + camelized.substr(1));
-      }
-
-      return out.join(".");
-    });
-
-    var UNDERSCORE_CACHE = new Cache(1000, function(str) {
-      return str.replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2').
-        replace(STRING_UNDERSCORE_REGEXP_2, '_').toLowerCase();
-    });
-
-    var CAPITALIZE_CACHE = new Cache(1000, function(str) {
-      return str.charAt(0).toUpperCase() + str.substr(1);
-    });
-
-    var DECAMELIZE_CACHE = new Cache(1000, function(str) {
-      return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();
-    });
-
+    var STRING_DASHERIZE_CACHE = {};
     var STRING_DECAMELIZE_REGEXP = (/([a-z\d])([A-Z])/g);
     var STRING_CAMELIZE_REGEXP = (/(\-|_|\.|\s)+(.)?/g);
     var STRING_UNDERSCORE_REGEXP_1 = (/([a-z\d])([A-Z]+)/g);
     var STRING_UNDERSCORE_REGEXP_2 = (/\-|\s+/g);
 
     function fmt(str, formats) {
-      var cachedFormats = formats;
-
-      if (!isArray(cachedFormats) || arguments.length > 2) {
-        cachedFormats = new Array(arguments.length - 1);
-
-        for (var i = 1, l = arguments.length; i < l; i++) {
-          cachedFormats[i - 1] = arguments[i];
-        }
+      if (!isArray(formats) || arguments.length > 2) {
+        formats = Array.prototype.slice.call(arguments, 1);
       }
 
       // first, replace any ORDERED replacements.
       var idx  = 0; // the current index for non-numerical replacements
       return str.replace(/%@([0-9]+)?/g, function(s, argIndex) {
         argIndex = (argIndex) ? parseInt(argIndex, 10) - 1 : idx++;
-        s = cachedFormats[argIndex];
+        s = formats[argIndex];
         return (s === null) ? '(null)' : (s === undefined) ? '' : emberInspect(s);
       });
     }
@@ -36365,27 +34802,51 @@ enifed("ember-runtime/system/string",
     }
 
     function decamelize(str) {
-      return DECAMELIZE_CACHE.get(str);
+      return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();
     }
 
     function dasherize(str) {
-      return STRING_DASHERIZE_CACHE.get(str);
+      var cache = STRING_DASHERIZE_CACHE,
+          hit   = cache.hasOwnProperty(str),
+          ret;
+
+      if (hit) {
+        return cache[str];
+      } else {
+        ret = decamelize(str).replace(STRING_DASHERIZE_REGEXP,'-');
+        cache[str] = ret;
+      }
+
+      return ret;
     }
 
     function camelize(str) {
-      return CAMELIZE_CACHE.get(str);
+      return str.replace(STRING_CAMELIZE_REGEXP, function(match, separator, chr) {
+        return chr ? chr.toUpperCase() : '';
+      }).replace(/^([A-Z])/, function(match, separator, chr) {
+        return match.toLowerCase();
+      });
     }
 
     function classify(str) {
-      return CLASSIFY_CACHE.get(str);
+      var parts = str.split("."),
+          out = [];
+
+      for (var i=0, l=parts.length; i<l; i++) {
+        var camelized = camelize(parts[i]);
+        out.push(camelized.charAt(0).toUpperCase() + camelized.substr(1));
+      }
+
+      return out.join(".");
     }
 
     function underscore(str) {
-      return UNDERSCORE_CACHE.get(str);
+      return str.replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2').
+        replace(STRING_UNDERSCORE_REGEXP_2, '_').toLowerCase();
     }
 
     function capitalize(str) {
-      return CAPITALIZE_CACHE.get(str);
+      return str.charAt(0).toUpperCase() + str.substr(1);
     }
 
     /**
@@ -36587,7 +35048,7 @@ enifed("ember-runtime/system/string",
     __exports__.underscore = underscore;
     __exports__.capitalize = capitalize;
   });
-enifed("ember-runtime/system/subarray",
+define("ember-runtime/system/subarray",
   ["ember-metal/property_get","ember-metal/error","ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -36630,15 +35091,15 @@ enifed("ember-runtime/system/subarray",
 
         @method addItem
 
-        @param {Number} index The index of the item in the tracked array.
-        @param {Boolean} match `true` iff the item is included in the subarray.
+        @param {number} index The index of the item in the tracked array.
+        @param {boolean} match `true` iff the item is included in the subarray.
 
         @return {number} The index of the item in the subarray.
       */
       addItem: function(index, match) {
-        var returnValue = -1;
-        var itemType = match ? RETAIN : FILTER;
-        var self = this;
+        var returnValue = -1,
+            itemType = match ? RETAIN : FILTER,
+            self = this;
 
         this._findOperation(index, function(operation, operationIndex, rangeStart, rangeEnd, seenInSubArray) {
           var newOperation, splitOperation;
@@ -36683,14 +35144,14 @@ enifed("ember-runtime/system/subarray",
 
         @method removeItem
 
-        @param {Number} index The index of the item in the tracked array.
+        @param {number} index The index of the item in the tracked array.
 
         @return {number} The index of the item in the subarray, or `-1` if the item
         was not in the subarray.
       */
       removeItem: function(index) {
-        var returnValue = -1;
-        var self = this;
+        var returnValue = -1,
+            self = this;
 
         this._findOperation(index, function (operation, operationIndex, rangeStart, rangeEnd, seenInSubArray) {
           if (operation.type === RETAIN) {
@@ -36712,8 +35173,12 @@ enifed("ember-runtime/system/subarray",
 
 
       _findOperation: function (index, foundCallback, notFoundCallback) {
-        var seenInSubArray = 0;
-        var operationIndex, len, operation, rangeStart, rangeEnd;
+        var operationIndex,
+            len,
+            operation,
+            rangeStart,
+            rangeEnd,
+            seenInSubArray = 0;
 
         // OPTIMIZE: change to balanced tree
         // find leftmost operation to the right of `index`
@@ -36733,8 +35198,8 @@ enifed("ember-runtime/system/subarray",
       },
 
       _composeAt: function(index) {
-        var op = this._operations[index];
-        var otherOp;
+        var op = this._operations[index],
+            otherOp;
 
         if (!op) {
           // Composing out of bounds is a no-op, as when removing the last operation
@@ -36769,7 +35234,7 @@ enifed("ember-runtime/system/subarray",
       }
     };
   });
-enifed("ember-runtime/system/tracked_array",
+define("ember-runtime/system/tracked_array",
   ["ember-metal/property_get","ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -36789,7 +35254,7 @@ enifed("ember-runtime/system/tracked_array",
 
       @class TrackedArray
       @namespace Ember
-      @param {Array} [items=[]] The array to be tracked.  This is used just to get
+      @param {array} [items=[]] The array to be tracked.  This is used just to get
       the initial items for the starting state of retain:n.
     */
     function TrackedArray(items) {
@@ -36821,11 +35286,15 @@ enifed("ember-runtime/system/tracked_array",
         var count = get(newItems, 'length');
         if (count < 1) { return; }
 
-        var match = this._findArrayOperation(index);
-        var arrayOperation = match.operation;
-        var arrayOperationIndex = match.index;
-        var arrayOperationRangeStart = match.rangeStart;
-        var composeIndex, splitIndex, splitItems, splitArrayOperation, newArrayOperation;
+        var match = this._findArrayOperation(index),
+            arrayOperation = match.operation,
+            arrayOperationIndex = match.index,
+            arrayOperationRangeStart = match.rangeStart,
+            composeIndex,
+            splitIndex,
+            splitItems,
+            splitArrayOperation,
+            newArrayOperation;
 
         newArrayOperation = new ArrayOperation(INSERT, count, newItems);
 
@@ -36857,11 +35326,12 @@ enifed("ember-runtime/system/tracked_array",
       removeItems: function (index, count) {
         if (count < 1) { return; }
 
-        var match = this._findArrayOperation(index);
-        var arrayOperation = match.operation;
-        var arrayOperationIndex = match.index;
-        var arrayOperationRangeStart = match.rangeStart;
-        var newArrayOperation, composeIndex;
+        var match = this._findArrayOperation(index),
+            arrayOperation = match.operation,
+            arrayOperationIndex = match.index,
+            arrayOperationRangeStart = match.rangeStart,
+            newArrayOperation,
+            composeIndex;
 
         newArrayOperation = new ArrayOperation(DELETE, count);
         if (!match.split) {
@@ -36889,11 +35359,11 @@ enifed("ember-runtime/system/tracked_array",
         `Ember.TrackedArray.{RETAIN, DELETE, INSERT}`
 
         @method apply
-        @param {Function} callback
+        @param {function} callback
       */
       apply: function (callback) {
-        var items = [];
-        var offset = 0;
+        var items = [],
+            offset = 0;
 
         forEach(this._operations, function (arrayOperation, operationIndex) {
           callback(arrayOperation.items, offset, arrayOperation.type, operationIndex);
@@ -36912,15 +35382,17 @@ enifed("ember-runtime/system/tracked_array",
 
         @method _findArrayOperation
 
-        @param {Number} index the index of the item whose operation information
+        @param {number} index the index of the item whose operation information
         should be returned.
         @private
       */
       _findArrayOperation: function (index) {
-        var split = false;
-        var arrayOperationIndex, arrayOperation,
-            arrayOperationRangeStart, arrayOperationRangeEnd,
-            len;
+        var arrayOperationIndex,
+            len,
+            split = false,
+            arrayOperation,
+            arrayOperationRangeStart,
+            arrayOperationRangeEnd;
 
         // OPTIMIZE: we could search these faster if we kept a balanced tree.
         // find leftmost arrayOperation to the right of `index`
@@ -36958,11 +35430,11 @@ enifed("ember-runtime/system/tracked_array",
 
       // see SubArray for a better implementation.
       _composeInsert: function (index) {
-        var newArrayOperation = this._operations[index];
-        var leftArrayOperation = this._operations[index-1]; // may be undefined
-        var rightArrayOperation = this._operations[index+1]; // may be undefined
-        var leftOp = leftArrayOperation && leftArrayOperation.type;
-        var rightOp = rightArrayOperation && rightArrayOperation.type;
+        var newArrayOperation = this._operations[index],
+            leftArrayOperation = this._operations[index-1], // may be undefined
+            rightArrayOperation = this._operations[index+1], // may be undefined
+            leftOp = leftArrayOperation && leftArrayOperation.type,
+            rightOp = rightArrayOperation && rightArrayOperation.type;
 
         if (leftOp === INSERT) {
             // merge left
@@ -36987,15 +35459,15 @@ enifed("ember-runtime/system/tracked_array",
       },
 
       _composeDelete: function (index) {
-        var arrayOperation = this._operations[index];
-        var deletesToGo = arrayOperation.count;
-        var leftArrayOperation = this._operations[index-1]; // may be undefined
-        var leftOp = leftArrayOperation && leftArrayOperation.type;
-        var nextArrayOperation;
-        var nextOp;
-        var nextCount;
-        var removeNewAndNextOp = false;
-        var removedItems = [];
+        var arrayOperation = this._operations[index],
+            deletesToGo = arrayOperation.count,
+            leftArrayOperation = this._operations[index-1], // may be undefined
+            leftOp = leftArrayOperation && leftArrayOperation.type,
+            nextArrayOperation,
+            nextOp,
+            nextCount,
+            removeNewAndNextOp = false,
+            removedItems = [];
 
         if (leftOp === DELETE) {
           arrayOperation = leftArrayOperation;
@@ -37068,10 +35540,10 @@ enifed("ember-runtime/system/tracked_array",
 
       @method ArrayOperation
       @private
-      @param {String} type The type of the operation.  One of
+      @param {string} type The type of the operation.  One of
       `Ember.TrackedArray.{RETAIN, INSERT, DELETE}`
-      @param {Number} count The number of items in this operation.
-      @param {Array} items The items of the operation, if included.  RETAIN and
+      @param {number} count The number of items in this operation.
+      @param {array} items The items of the operation, if included.  RETAIN and
       INSERT include their items, DELETE does not.
     */
     function ArrayOperation (operation, count, items) {
@@ -37087,10 +35559,10 @@ enifed("ember-runtime/system/tracked_array",
       @method ArrayOperationMatch
       @private
       @param {ArrayOperation} operation
-      @param {Number} index The index of `operation` in the array of operations.
-      @param {Boolean} split Whether or not the item index searched for would
+      @param {number} index The index of `operation` in the array of operations.
+      @param {boolean} split Whether or not the item index searched for would
       require a split for a new operation type.
-      @param {Number} rangeStart The index of the first item in the operation,
+      @param {number} rangeStart The index of the first item in the operation,
       with respect to the tracked array.  The index of the last item can be computed
       from `rangeStart` and `operation.count`.
     */
@@ -37101,7 +35573,7 @@ enifed("ember-runtime/system/tracked_array",
       this.rangeStart = rangeStart;
     }
   });
-enifed("ember-testing",
+define("ember-testing",
   ["ember-metal/core","ember-testing/initializers","ember-testing/support","ember-testing/setup_for_testing","ember-testing/test","ember-testing/adapters/adapter","ember-testing/adapters/qunit","ember-testing/helpers"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
     "use strict";
@@ -37129,7 +35601,7 @@ enifed("ember-testing",
     Ember.Test.QUnitAdapter = QUnitAdapter;
     Ember.setupForTesting = setupForTesting;
   });
-enifed("ember-testing/adapters/adapter",
+define("ember-testing/adapters/adapter",
   ["ember-metal/core","ember-metal/utils","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -37194,7 +35666,7 @@ enifed("ember-testing/adapters/adapter",
 
     __exports__["default"] = Adapter;
   });
-enifed("ember-testing/adapters/qunit",
+define("ember-testing/adapters/qunit",
   ["ember-testing/adapters/adapter","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -37221,7 +35693,7 @@ enifed("ember-testing/adapters/qunit",
       }
     });
   });
-enifed("ember-testing/helpers",
+define("ember-testing/helpers",
   ["ember-metal/property_get","ember-metal/error","ember-metal/run_loop","ember-views/system/jquery","ember-testing/test"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
     "use strict";
@@ -37299,33 +35771,26 @@ enifed("ember-testing/helpers",
       return app.testHelpers.wait();
     }
 
-    function triggerEvent(app, selector, contextOrType, typeOrOptions, possibleOptions){
-      var arity = arguments.length;
-      var context, type, options;
-
-      if (arity === 3) {
+    function triggerEvent(app, selector, context, type, options){
+      if (arguments.length === 3) {
         // context and options are optional, so this is
         // app, selector, type
+        type = context;
         context = null;
-        type = contextOrType;
         options = {};
-      } else if (arity === 4) {
+      }
+
+      if (arguments.length === 4) {
         // context and options are optional, so this is
-        if (typeof typeOrOptions === "object") {  // either
+        if (typeof type === "object") {  // either
           // app, selector, type, options
+          options = type;
+          type = context;
           context = null;
-          type = contextOrType;
-          options = typeOrOptions;
         } else { // or
           // app, selector, context, type
-          context = contextOrType;
-          type = typeOrOptions;
           options = {};
         }
-      } else {
-        context = contextOrType;
-        type = typeOrOptions;
-        options = possibleOptions;
       }
 
       var $el = app.testHelpers.findWithAssert(selector, context);
@@ -37337,27 +35802,21 @@ enifed("ember-testing/helpers",
       return app.testHelpers.wait();
     }
 
-    function keyEvent(app, selector, contextOrType, typeOrKeyCode, keyCode) {
-      var context, type;
-
+    function keyEvent(app, selector, context, type, keyCode) {
       if (typeof keyCode === 'undefined') {
+        keyCode = type;
+        type = context;
         context = null;
-        keyCode = typeOrKeyCode;
-        type = contextOrType;
-      } else {
-        context = contextOrType;
-        type = typeOrKeyCode;
       }
 
       return app.testHelpers.triggerEvent(selector, context, type, { keyCode: keyCode, which: keyCode });
     }
 
-    function fillIn(app, selector, contextOrText, text) {
-      var $el, context;
+    function fillIn(app, selector, context, text) {
+      var $el;
       if (typeof text === 'undefined') {
-        text = contextOrText;
-      } else {
-        context = contextOrText;
+        text = context;
+        context = null;
       }
       $el = app.testHelpers.findWithAssert(selector, context);
       run(function() {
@@ -37644,7 +36103,7 @@ enifed("ember-testing/helpers",
     */
     asyncHelper('triggerEvent', triggerEvent);
   });
-enifed("ember-testing/initializers",
+define("ember-testing/initializers",
   ["ember-runtime/system/lazy_load"],
   function(__dependency1__) {
     "use strict";
@@ -37666,7 +36125,7 @@ enifed("ember-testing/initializers",
       }
     });
   });
-enifed("ember-testing/setup_for_testing",
+define("ember-testing/setup_for_testing",
   ["ember-metal/core","ember-testing/adapters/qunit","ember-views/system/jquery","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -37721,7 +36180,7 @@ enifed("ember-testing/setup_for_testing",
       jQuery(document).on('ajaxComplete', decrementAjaxPendingRequests);
     }
   });
-enifed("ember-testing/support",
+define("ember-testing/support",
   ["ember-metal/core","ember-views/system/jquery"],
   function(__dependency1__, __dependency2__) {
     "use strict";
@@ -37781,7 +36240,7 @@ enifed("ember-testing/support",
       });
     });
   });
-enifed("ember-testing/test",
+define("ember-testing/test",
   ["ember-metal/core","ember-metal/run_loop","ember-metal/platform","ember-runtime/compare","ember-runtime/ext/rsvp","ember-testing/setup_for_testing","ember-application/system/application","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
@@ -38066,12 +36525,12 @@ enifed("ember-testing/test",
     };
 
     function helper(app, name) {
-      var fn = helpers[name].method;
-      var meta = helpers[name].meta;
+      var fn = helpers[name].method,
+          meta = helpers[name].meta;
 
       return function() {
-        var args = slice.call(arguments);
-        var lastPromise = Test.lastPromise;
+        var args = slice.call(arguments),
+            lastPromise = Test.lastPromise;
 
         args.unshift(app);
 
@@ -38305,9 +36764,9 @@ enifed("ember-testing/test",
 
     __exports__["default"] = Test;
   });
-enifed("ember-views",
-  ["ember-runtime","ember-views/system/jquery","ember-views/system/utils","ember-views/system/render_buffer","ember-views/system/ext","ember-views/views/states","ember-views/views/core_view","ember-views/views/view","ember-views/views/container_view","ember-views/views/collection_view","ember-views/views/component","ember-views/system/event_dispatcher","ember-views/mixins/view_target_action_support","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
+define("ember-views",
+  ["ember-runtime","ember-views/system/jquery","ember-views/system/utils","ember-views/system/render_buffer","ember-views/system/ext","ember-views/views/states","ember-views/views/core_view","ember-views/views/view","ember-views/views/view_collection","ember-views/views/container_view","ember-views/views/collection_view","ember-views/views/component","ember-views/system/event_dispatcher","ember-views/mixins/view_target_action_support","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {
     "use strict";
     /**
     Ember Views
@@ -38321,6 +36780,7 @@ enifed("ember-views",
     // BEGIN IMPORTS
     var Ember = __dependency1__["default"];
     var jQuery = __dependency2__["default"];
+    var setInnerHTML = __dependency3__.setInnerHTML;
     var isSimpleClick = __dependency3__.isSimpleClick;
     var RenderBuffer = __dependency4__["default"];
      // for the side effect of extending Ember.run.queues
@@ -38329,12 +36789,13 @@ enifed("ember-views",
 
     var CoreView = __dependency7__["default"];
     var View = __dependency8__["default"];
-    var ContainerView = __dependency9__["default"];
-    var CollectionView = __dependency10__["default"];
-    var Component = __dependency11__["default"];
+    var ViewCollection = __dependency9__["default"];
+    var ContainerView = __dependency10__["default"];
+    var CollectionView = __dependency11__["default"];
+    var Component = __dependency12__["default"];
 
-    var EventDispatcher = __dependency12__["default"];
-    var ViewTargetActionSupport = __dependency13__["default"];
+    var EventDispatcher = __dependency13__["default"];
+    var ViewTargetActionSupport = __dependency14__["default"];
     // END IMPORTS
 
     /**
@@ -38351,6 +36812,7 @@ enifed("ember-views",
     Ember.RenderBuffer = RenderBuffer;
 
     var ViewUtils = Ember.ViewUtils = {};
+    ViewUtils.setInnerHTML = setInnerHTML;
     ViewUtils.isSimpleClick = isSimpleClick;
 
     Ember.CoreView = CoreView;
@@ -38358,6 +36820,7 @@ enifed("ember-views",
     Ember.View.states = states;
     Ember.View.cloneStates = cloneStates;
 
+    Ember._ViewCollection = ViewCollection;
     Ember.ContainerView = ContainerView;
     Ember.CollectionView = CollectionView;
     Ember.Component = Component;
@@ -38366,7 +36829,7 @@ enifed("ember-views",
 
     __exports__["default"] = Ember;
   });
-enifed("ember-views/mixins/component_template_deprecation",
+define("ember-views/mixins/component_template_deprecation",
   ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -38409,8 +36872,8 @@ enifed("ember-views/mixins/component_template_deprecation",
         // there is another Mixin loaded first.
         this._super.apply(this, arguments);
 
-        var deprecatedProperty, replacementProperty;
-        var layoutSpecified = (props.layoutName || props.layout || get(this, 'layoutName'));
+        var deprecatedProperty, replacementProperty,
+            layoutSpecified = (props.layoutName || props.layout || get(this, 'layoutName'));
 
         if (props.templateName && !layoutSpecified) {
           deprecatedProperty = 'templateName';
@@ -38434,7 +36897,7 @@ enifed("ember-views/mixins/component_template_deprecation",
       }
     });
   });
-enifed("ember-views/mixins/view_target_action_support",
+define("ember-views/mixins/view_target_action_support",
   ["ember-metal/mixin","ember-runtime/mixins/target_action_support","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -38497,31 +36960,9 @@ enifed("ember-views/mixins/view_target_action_support",
       actionContext: alias('context')
     });
   });
-enifed("ember-views/system/action_manager",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    /**
-    @module ember
-    @submodule ember-views
-    */
-
-    function ActionManager() {}
-
-    /**
-      Global action id hash.
-
-      @private
-      @property registeredActions
-      @type Object
-    */
-    ActionManager.registeredActions = {};
-
-    __exports__["default"] = ActionManager;
-  });
-enifed("ember-views/system/event_dispatcher",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/object","ember-views/system/jquery","ember-views/system/action_manager","ember-views/views/view","ember-metal/merge","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+define("ember-views/system/event_dispatcher",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/object","ember-views/system/jquery","ember-views/views/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -38538,9 +36979,9 @@ enifed("ember-views/system/event_dispatcher",
     var fmt = __dependency7__.fmt;
     var EmberObject = __dependency8__["default"];
     var jQuery = __dependency9__["default"];
-    var ActionManager = __dependency10__["default"];
-    var View = __dependency11__["default"];
-    var merge = __dependency12__["default"];
+    var View = __dependency10__["default"];
+
+    var ActionHelper;
 
     //ES6TODO:
     // find a better way to do Ember.View.views without global state
@@ -38659,7 +37100,7 @@ enifed("ember-views/system/event_dispatcher",
       setup: function(addedEvents, rootElement) {
         var event, events = get(this, 'events');
 
-        merge(events, addedEvents || {});
+        jQuery.extend(events, addedEvents || {});
 
         if (!isNone(rootElement)) {
           set(this, 'rootElement', rootElement);
@@ -38700,8 +37141,8 @@ enifed("ember-views/system/event_dispatcher",
         var self = this;
 
         rootElement.on(event + '.ember', '.ember-view', function(evt, triggeringManager) {
-          var view = View.views[this.id];
-          var result = true;
+          var view = View.views[this.id],
+              result = true;
 
           var manager = self.canDispatchToEventManager ? self._findNearestEventManager(view, eventName) : null;
 
@@ -38715,8 +37156,11 @@ enifed("ember-views/system/event_dispatcher",
         });
 
         rootElement.on(event + '.ember', '[data-ember-action]', function(evt) {
-          var actionId = jQuery(evt.currentTarget).attr('data-ember-action');
-          var action   = ActionManager.registeredActions[actionId];
+          //ES6TODO: Needed for ActionHelper (generally not available in ember-views test suite)
+          if (!ActionHelper) { ActionHelper = requireModule("ember-routing-handlebars/helpers/action")["ActionHelper"]; }
+
+          var actionId = jQuery(evt.currentTarget).attr('data-ember-action'),
+              action   = ActionHelper.registeredActions[actionId];
 
           // We have to check for action here since in some cases, jQuery will trigger
           // an event on `removeChild` (i.e. focusout) after we've already torn down the
@@ -38767,11 +37211,11 @@ enifed("ember-views/system/event_dispatcher",
       },
 
       toString: function() {
-        return '(EventDispatcher)';
+        return '(EventDisptacher)';
       }
     });
   });
-enifed("ember-views/system/ext",
+define("ember-views/system/ext",
   ["ember-metal/run_loop"],
   function(__dependency1__) {
     "use strict";
@@ -38789,7 +37233,7 @@ enifed("ember-views/system/ext",
     run._addQueue('render', 'actions');
     run._addQueue('afterRender', 'render');
   });
-enifed("ember-views/system/jquery",
+define("ember-views/system/jquery",
   ["ember-metal/core","ember-runtime/system/string","ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -38810,8 +37254,8 @@ enifed("ember-views/system/jquery",
     */
 
     var jQuery = (Ember.imports && Ember.imports.jQuery) || (this && this.jQuery);
-    if (!jQuery && typeof eriuqer === 'function') {
-      jQuery = eriuqer('jquery');
+    if (!jQuery && typeof require === 'function') {
+      jQuery = require('jquery');
     }
 
     Ember.assert("Ember Views require jQuery between 1.7 and 2.1", jQuery && (jQuery().jquery.match(/^((1\.(7|8|9|10|11))|(2\.(0|1)))(\.\d+)?(pre|rc\d?)?/) || Ember.ENV.FORCE_JQUERY));
@@ -38833,74 +37277,31 @@ enifed("ember-views/system/jquery",
 
     __exports__["default"] = jQuery;
   });
-enifed("ember-views/system/render_buffer",
-  ["ember-views/system/jquery","morph","ember-metal/core","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+define("ember-views/system/render_buffer",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-views/system/utils","ember-views/system/jquery","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     /**
     @module ember
     @submodule ember-views
     */
 
-    var jQuery = __dependency1__["default"];
-    var DOMHelper = __dependency2__.DOMHelper;
-    var Ember = __dependency3__["default"];
-    var create = __dependency4__.create;
+    var Ember = __dependency1__["default"];
+    // jQuery
 
-    // The HTML spec allows for "omitted start tags". These tags are optional
-    // when their intended child is the first thing in the parent tag. For
-    // example, this is a tbody start tag:
-    //
-    // <table>
-    //   <tbody>
-    //     <tr>
-    //
-    // The tbody may be omitted, and the browser will accept and render:
-    //
-    // <table>
-    //   <tr>
-    //
-    // However, the omitted start tag will still be added to the DOM. Here
-    // we test the string and context to see if the browser is about to
-    // perform this cleanup, but with a special allowance for disregarding
-    // <script tags. This disregarding of <script being the first child item
-    // may bend the offical spec a bit, and is only needed for Handlebars
-    // templates.
-    //
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags
-    // describes which tags are omittable. The spec for tbody and colgroup
-    // explains this behavior:
-    //
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-tbody-element
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-colgroup-element
-    //
-    var omittedStartTagChildren = {
-      tr: document.createElement('tbody'),
-      col: document.createElement('colgroup')
-    };
-
-    var omittedStartTagChildTest = /(?:<script)*.*?<([\w:]+)/i;
-
-    function detectOmittedStartTag(string, contextualElement){
-      // Omitted start tags are only inside table tags.
-      if (contextualElement.tagName === 'TABLE') {
-        var omittedStartTagChildMatch = omittedStartTagChildTest.exec(string);
-        if (omittedStartTagChildMatch) {
-          // It is already asserted that the contextual element is a table
-          // and not the proper start tag. Just look up the start tag.
-          return omittedStartTagChildren[omittedStartTagChildMatch[1].toLowerCase()];
-        }
-      }
-    }
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var setInnerHTML = __dependency4__.setInnerHTML;
+    var jQuery = __dependency5__["default"];
 
     function ClassSet() {
-      this.seen = create(null);
+      this.seen = {};
       this.list = [];
     }
 
     ClassSet.prototype = {
       add: function(string) {
-        if (this.seen[string] === true) { return; }
+        if (string in this.seen) { return; }
         this.seen[string] = true;
 
         this.list.push(string);
@@ -38954,8 +37355,8 @@ enifed("ember-views/system/render_buffer",
     // From http://msdn.microsoft.com/en-us/library/ie/ms536389(v=vs.85).aspx:
     // "To include the NAME attribute at run time on objects created with the createElement method, use the eTag."
     var canSetNameOnInputs = (function() {
-      var div = document.createElement('div');
-      var el = document.createElement('input');
+      var div = document.createElement('div'),
+          el = document.createElement('input');
 
       el.setAttribute('name', 'foo');
       div.appendChild(el);
@@ -38964,51 +37365,34 @@ enifed("ember-views/system/render_buffer",
     })();
 
     /**
-      `Ember.renderBuffer` gathers information regarding the view and generates the
-      final representation. `Ember.renderBuffer` will generate HTML which can be pushed
+      `Ember.RenderBuffer` gathers information regarding the view and generates the
+      final representation. `Ember.RenderBuffer` will generate HTML which can be pushed
       to the DOM.
 
        ```javascript
-       var buffer = Ember.renderBuffer('div', contextualElement);
+       var buffer = Ember.RenderBuffer('div');
       ```
 
-      @method renderBuffer
+      @class RenderBuffer
       @namespace Ember
+      @constructor
       @param {String} tagName tag name (such as 'div' or 'p') used for the buffer
     */
-    __exports__["default"] = function renderBuffer(tagName, contextualElement) {
-      return new _RenderBuffer(tagName, contextualElement); // jshint ignore:line
+    __exports__["default"] = function RenderBuffer(tagName) {
+      return new _RenderBuffer(tagName); // jshint ignore:line
     }
 
-    function _RenderBuffer(tagName, contextualElement) {
-      this.tagName = tagName;
-      this._outerContextualElement = contextualElement;
-      this.buffer = null;
-      this.childViews = [];
-      this.dom = new DOMHelper();
+    function _RenderBuffer(tagName) {
+      this.tagNames = [tagName || null];
+      this.buffer = "";
     }
 
     _RenderBuffer.prototype = {
 
-      reset: function(tagName, contextualElement) {
-        this.tagName = tagName;
-        this.buffer = null;
-        this._element = null;
-        this._outerContextualElement = contextualElement;
-        this.elementClasses = null;
-        this.elementId = null;
-        this.elementAttributes = null;
-        this.elementProperties = null;
-        this.elementTag = null;
-        this.elementStyle = null;
-        this.childViews.length = 0;
-      },
-
       // The root view's element
       _element: null,
 
-      // The root view's contextualElement
-      _outerContextualElement: null,
+      _hasElement: true,
 
       /**
         An internal set used to de-dupe class names when `addClass()` is
@@ -39083,7 +37467,7 @@ enifed("ember-views/system/render_buffer",
         example, if you wanted to create a `p` tag, then you would call
 
         ```javascript
-        Ember.RenderBuffer('p', contextualElement)
+        Ember.RenderBuffer('p')
         ```
 
         @property elementTag
@@ -39107,37 +37491,6 @@ enifed("ember-views/system/render_buffer",
       */
       elementStyle: null,
 
-      pushChildView: function (view) {
-        var index = this.childViews.length;
-        this.childViews[index] = view;
-        this.push("<script id='morph-"+index+"' type='text/x-placeholder'>\x3C/script>");
-      },
-
-      hydrateMorphs: function (contextualElement) {
-        var childViews = this.childViews;
-        var el = this._element;
-        for (var i=0,l=childViews.length; i<l; i++) {
-          var childView = childViews[i];
-          var ref = el.querySelector('#morph-'+i);
-
-          Ember.assert('An error occured while setting up template bindings. Please check ' +
-                       (childView && childView._parentView && childView._parentView._debugTemplateName ?
-                            '"' + childView._parentView._debugTemplateName + '" template ' :
-                            ''
-                       )  + 'for invalid markup or bindings within HTML comments.',
-                       ref);
-
-          var parent = ref.parentNode;
-
-          childView._morph = this.dom.insertMorphBefore(
-            parent,
-            ref,
-            parent.nodeType === 1 ? parent : contextualElement
-          );
-          parent.removeChild(ref);
-        }
-      },
-
       /**
         Adds a string of HTML to the `RenderBuffer`.
 
@@ -39145,11 +37498,8 @@ enifed("ember-views/system/render_buffer",
         @param {String} string HTML to push into the buffer
         @chainable
       */
-      push: function(content) {
-        if (this.buffer === null) {
-          this.buffer = '';
-        }
-        this.buffer += content;
+      push: function(string) {
+        this.buffer += string;
         return this;
       },
 
@@ -39171,8 +37521,7 @@ enifed("ember-views/system/render_buffer",
 
       setClasses: function(classNames) {
         this.elementClasses = null;
-        var len = classNames.length;
-        var i;
+        var len = classNames.length, i;
         for (i = 0; i < len; i++) {
           this.addClass(classNames[i]);
         }
@@ -39278,15 +37627,102 @@ enifed("ember-views/system/render_buffer",
         return this;
       },
 
+      begin: function(tagName) {
+        this.tagNames.push(tagName || null);
+        return this;
+      },
+
+      pushOpeningTag: function() {
+        var tagName = this.currentTagName();
+        if (!tagName) { return; }
+
+        if (this._hasElement && !this._element && this.buffer.length === 0) {
+          this._element = this.generateElement();
+          return;
+        }
+
+        var buffer = this.buffer,
+            id = this.elementId,
+            classes = this.classes,
+            attrs = this.elementAttributes,
+            props = this.elementProperties,
+            style = this.elementStyle,
+            attr, prop;
+
+        buffer += '<' + stripTagName(tagName);
+
+        if (id) {
+          buffer += ' id="' + escapeAttribute(id) + '"';
+          this.elementId = null;
+        }
+        if (classes) {
+          buffer += ' class="' + escapeAttribute(classes.join(' ')) + '"';
+          this.classes = null;
+          this.elementClasses = null;
+        }
+
+        if (style) {
+          buffer += ' style="';
+
+          for (prop in style) {
+            if (style.hasOwnProperty(prop)) {
+              buffer += prop + ':' + escapeAttribute(style[prop]) + ';';
+            }
+          }
+
+          buffer += '"';
+
+          this.elementStyle = null;
+        }
+
+        if (attrs) {
+          for (attr in attrs) {
+            if (attrs.hasOwnProperty(attr)) {
+              buffer += ' ' + attr + '="' + escapeAttribute(attrs[attr]) + '"';
+            }
+          }
+
+          this.elementAttributes = null;
+        }
+
+        if (props) {
+          for (prop in props) {
+            if (props.hasOwnProperty(prop)) {
+              var value = props[prop];
+              if (value || typeof(value) === 'number') {
+                if (value === true) {
+                  buffer += ' ' + prop + '="' + prop + '"';
+                } else {
+                  buffer += ' ' + prop + '="' + escapeAttribute(props[prop]) + '"';
+                }
+              }
+            }
+          }
+
+          this.elementProperties = null;
+        }
+
+        buffer += '>';
+        this.buffer = buffer;
+      },
+
+      pushClosingTag: function() {
+        var tagName = this.tagNames.pop();
+        if (tagName) { this.buffer += '</' + stripTagName(tagName) + '>'; }
+      },
+
+      currentTagName: function() {
+        return this.tagNames[this.tagNames.length-1];
+      },
+
       generateElement: function() {
-        var tagName = this.tagName;
-        var id = this.elementId;
-        var classes = this.classes;
-        var attrs = this.elementAttributes;
-        var props = this.elementProperties;
-        var style = this.elementStyle;
-        var styleBuffer = '';
-        var attr, prop, tagString;
+        var tagName = this.tagNames.pop(), // pop since we don't need to close
+            id = this.elementId,
+            classes = this.classes,
+            attrs = this.elementAttributes,
+            props = this.elementProperties,
+            style = this.elementStyle,
+            styleBuffer = '', attr, prop, tagString;
 
         if (attrs && attrs.name && !canSetNameOnInputs) {
           // IE allows passing a tag to createElement. See note on `canSetNameOnInputs` above as well.
@@ -39295,15 +37731,15 @@ enifed("ember-views/system/render_buffer",
           tagString = tagName;
         }
 
-        var element = this.dom.createElement(tagString, this.outerContextualElement());
-        var $element = jQuery(element);
+        var element = document.createElement(tagString),
+            $element = jQuery(element);
 
         if (id) {
-          this.dom.setAttribute(element, 'id', id);
+          $element.attr('id', id);
           this.elementId = null;
         }
         if (classes) {
-          this.dom.setAttribute(element, 'class', classes.join(' '));
+          $element.attr('class', classes.join(' '));
           this.classes = null;
           this.elementClasses = null;
         }
@@ -39315,7 +37751,7 @@ enifed("ember-views/system/render_buffer",
             }
           }
 
-          this.dom.setAttribute(element, 'style', styleBuffer);
+          $element.attr('style', styleBuffer);
 
           this.elementStyle = null;
         }
@@ -39323,7 +37759,7 @@ enifed("ember-views/system/render_buffer",
         if (attrs) {
           for (attr in attrs) {
             if (attrs.hasOwnProperty(attr)) {
-              this.dom.setAttribute(element, attr, attrs[attr]);
+              $element.attr(attr, attrs[attr]);
             }
           }
 
@@ -39340,7 +37776,7 @@ enifed("ember-views/system/render_buffer",
           this.elementProperties = null;
         }
 
-        this._element = element;
+        return element;
       },
 
       /**
@@ -39349,26 +37785,12 @@ enifed("ember-views/system/render_buffer",
           of this buffer
       */
       element: function() {
-        var content = this.innerContent();
-        // No content means a text node buffer, with the content
-        // in _element. HandlebarsBoundView is an example.
-        if (content === null)  {
-          return this._element;
-        }
+        var html = this.innerString();
 
-        var contextualElement = this.innerContextualElement(content);
-        this.dom.detectNamespace(contextualElement);
-
-        if (!this._element) {
-          this._element = document.createDocumentFragment();
+        if (html) {
+          this._element = setInnerHTML(this._element, html);
         }
 
-        var nodes = this.dom.parseHTML(content, contextualElement);
-        while (nodes[0]) {
-          this._element.appendChild(nodes[0]);
-        }
-        this.hydrateMorphs(contextualElement);
-
         return this._element;
       },
 
@@ -39379,10 +37801,9 @@ enifed("ember-views/system/render_buffer",
         @return {String} The generated HTML
       */
       string: function() {
-        if (this._element) {
+        if (this._hasElement && this._element) {
           // Firefox versions < 11 do not have support for element.outerHTML.
-          var thisElement = this.element();
-          var outerHTML = thisElement.outerHTML;
+          var thisElement = this.element(), outerHTML = thisElement.outerHTML;
           if (typeof outerHTML === 'undefined') {
             return jQuery('<div/>').append(thisElement).html();
           }
@@ -39392,236 +37813,157 @@ enifed("ember-views/system/render_buffer",
         }
       },
 
-      outerContextualElement: function() {
-        if (!this._outerContextualElement) {
-          Ember.deprecate("The render buffer expects an outer contextualElement to exist." +
-                          " This ensures DOM that requires context is correctly generated (tr, SVG tags)." +
-                          " Defaulting to document.body, but this will be removed in the future");
-          this.outerContextualElement = document.body;
-        }
-        return this._outerContextualElement;
-      },
-
-      innerContextualElement: function(html) {
-        var innerContextualElement;
-        if (this._element && this._element.nodeType === 1) {
-          innerContextualElement = this._element;
-        } else {
-          innerContextualElement = this.outerContextualElement();
-        }
-
-        var omittedStartTag;
-        if (html) {
-          omittedStartTag = detectOmittedStartTag(html, innerContextualElement);
-        }
-        return omittedStartTag || innerContextualElement;
-      },
-
       innerString: function() {
-        var content = this.innerContent();
-        if (content && !content.nodeType) {
-          return content;
-        }
-      },
-
-      innerContent: function() {
         return this.buffer;
       }
     };
   });
-enifed("ember-views/system/renderer",
-  ["ember-metal/core","ember-metal-views/renderer","ember-metal/platform","ember-views/system/render_buffer","ember-metal/run_loop","ember-metal/property_set","ember-metal/instrumentation","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+define("ember-views/system/utils",
+  ["ember-metal/core","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
+    /* globals XMLSerializer */
+
     var Ember = __dependency1__["default"];
-    var Renderer = __dependency2__["default"];
-    var create = __dependency3__.create;
-    var renderBuffer = __dependency4__["default"];
-    var run = __dependency5__["default"];
-    var set = __dependency6__.set;
-    var _instrumentStart = __dependency7__._instrumentStart;
-    var subscribers = __dependency7__.subscribers;
+    // Ember.assert
 
-    function EmberRenderer() {
-      this.buffer = renderBuffer();
-      Renderer.call(this);
-    }
-    EmberRenderer.prototype = create(Renderer.prototype);
-    EmberRenderer.prototype.constructor = EmberRenderer;
-
-    var BAD_TAG_NAME_TEST_REGEXP = /[^a-zA-Z0-9\-]/;
-    var BAD_TAG_NAME_REPLACE_REGEXP = /[^a-zA-Z0-9\-]/g;
-
-    function stripTagName(tagName) {
-      if (!tagName) {
-        return tagName;
-      }
-
-      if (!BAD_TAG_NAME_TEST_REGEXP.test(tagName)) {
-        return tagName;
-      }
-
-      return tagName.replace(BAD_TAG_NAME_REPLACE_REGEXP, '');
-    }
-
-    EmberRenderer.prototype.scheduleRender =
-      function EmberRenderer_scheduleRender(ctx, fn) {
-        return run.scheduleOnce('render', ctx, fn);
-      };
-
-    EmberRenderer.prototype.cancelRender =
-      function EmberRenderer_cancelRender(id) {
-        run.cancel(id);
-      };
-
-    EmberRenderer.prototype.createChildViewsMorph =
-      function EmberRenderer_createChildViewsMorph(view, _element) {
-        if (view.createChildViewsMorph) {
-          return view.createChildViewsMorph(_element);
-        }
-        var element = _element;
-        if (view.tagName === '') {
-          if (view._morph) {
-            view._childViewsMorph = view._morph;
-          } else {
-            element = document.createDocumentFragment();
-            view._childViewsMorph = this._dom.appendMorph(element);
-          }
-        } else {
-          view._childViewsMorph = this._dom.createMorph(element, element.lastChild, null);
-        }
-        return element;
-      };
-
-    EmberRenderer.prototype.createElement =
-      function EmberRenderer_createElement(view, contextualElement) {
-        // If this is the top-most view, start a new buffer. Otherwise,
-        // create a new buffer relative to the original using the
-        // provided buffer operation (for example, `insertAfter` will
-        // insert a new buffer after the "parent buffer").
-        var tagName = view.tagName;
-        var classNameBindings = view.classNameBindings;
-        var taglessViewWithClassBindings = tagName === '' && classNameBindings.length > 0;
-
-        if (tagName === null || tagName === undefined) {
-          tagName = 'div';
-        }
-
-        Ember.assert('You cannot use `classNameBindings` on a tag-less view: ' + view.toString(), !taglessViewWithClassBindings);
-
-        var buffer = view.buffer = this.buffer;
-        buffer.reset(tagName, contextualElement);
-
-        if (view.beforeRender) {
-          view.beforeRender(buffer);
-        }
-
-        if (tagName !== '') {
-          if (view.applyAttributesToBuffer) {
-            view.applyAttributesToBuffer(buffer);
-          }
-          buffer.generateElement();
-        }
-
-        if (view.render) {
-          view.render(buffer);
-        }
-
-        if (view.afterRender) {
-          view.afterRender(buffer);
-        }
-
-        var element = buffer.element();
-
-        if (view.isContainer) {
-          this.createChildViewsMorph(view, element);
-        }
-
-        view.buffer = null;
-        if (element && element.nodeType === 1) {
-          // We have hooks, we shouldn't make element observable
-          // consider just doing view.element = element
-          set(view, 'element', element);
-        }
-        return element;
-      };
-
-    EmberRenderer.prototype.destroyView = function destroyView(view) {
-      view.removedFromDOM = true;
-      view.destroy();
-    };
-
-    EmberRenderer.prototype.childViews = function childViews(view) {
-      return view._childViews;
-    };
-
-    Renderer.prototype.willCreateElement = function (view) {
-      if (subscribers.length && view.instrumentDetails) {
-        view._instrumentEnd = _instrumentStart('render.'+view.instrumentName, function viewInstrumentDetails() {
-          var details = {};
-          view.instrumentDetails(details);
-          return details;
-        });
-      }
-      if (view._transitionTo) {
-        view._transitionTo('inBuffer');
-      }
-    }; // inBuffer
-    Renderer.prototype.didCreateElement = function (view) {
-      if (view._transitionTo) {
-        view._transitionTo('hasElement');
-      }
-      if (view._instrumentEnd) {
-        view._instrumentEnd();
-      }
-    }; // hasElement
-    Renderer.prototype.willInsertElement = function (view) {
-      if (view.trigger) { view.trigger('willInsertElement'); }
-    }; // will place into DOM
-    Renderer.prototype.didInsertElement = function (view) {
-      if (view._transitionTo) {
-        view._transitionTo('inDOM');
-      }
-      if (view.trigger) { view.trigger('didInsertElement'); }
-    }; // inDOM // placed into DOM
-
-    Renderer.prototype.willRemoveElement = function (view) {};
-
-    Renderer.prototype.willDestroyElement = function (view) {
-      if (view.trigger) { view.trigger('willDestroyElement'); }
-      if (view.trigger) { view.trigger('willClearRender'); }
-    };
-
-    Renderer.prototype.didDestroyElement = function (view) {
-      set(view, 'element', null);
-      if (view._transitionTo) {
-        view._transitionTo('preRender');
-      }
-    }; // element destroyed so view.destroy shouldn't try to remove it removedFromDOM
-
-    __exports__["default"] = EmberRenderer;
-  });
-enifed("ember-views/system/utils",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
     /**
     @module ember
     @submodule ember-views
     */
 
-    function isSimpleClick(event) {
-      var modifier = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey;
-      var secondaryClick = event.which > 1; // IE9 may return undefined
+    /* BEGIN METAMORPH HELPERS */
+
+    // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
+    // is a "zero-scope" element. This problem can be worked around by making
+    // the first node an invisible text node. We, like Modernizr, use &shy;
+
+    var needsShy = typeof document !== 'undefined' && (function() {
+      var testEl = document.createElement('div');
+      testEl.innerHTML = "<div></div>";
+      testEl.firstChild.innerHTML = "<script></script>";
+      return testEl.firstChild.innerHTML === '';
+    })();
+
+    // IE 8 (and likely earlier) likes to move whitespace preceeding
+    // a script tag to appear after it. This means that we can
+    // accidentally remove whitespace when updating a morph.
+    var movesWhitespace = typeof document !== 'undefined' && (function() {
+      var testEl = document.createElement('div');
+      testEl.innerHTML = "Test: <script type='text/x-placeholder'></script>Value";
+      return testEl.childNodes[0].nodeValue === 'Test:' &&
+              testEl.childNodes[2].nodeValue === ' Value';
+    })();
+
+    // Use this to find children by ID instead of using jQuery
+    var findChildById = function(element, id) {
+      if (element.getAttribute('id') === id) { return element; }
+
+      var len = element.childNodes.length, idx, node, found;
+      for (idx=0; idx<len; idx++) {
+        node = element.childNodes[idx];
+        found = node.nodeType === 1 && findChildById(node, id);
+        if (found) { return found; }
+      }
+    };
+
+    var setInnerHTMLWithoutFix = function(element, html) {
+      if (needsShy) {
+        html = '&shy;' + html;
+      }
+
+      var matches = [];
+      if (movesWhitespace) {
+        // Right now we only check for script tags with ids with the
+        // goal of targeting morphs.
+        html = html.replace(/(\s+)(<script id='([^']+)')/g, function(match, spaces, tag, id) {
+          matches.push([id, spaces]);
+          return tag;
+        });
+      }
+
+      element.innerHTML = html;
+
+      // If we have to do any whitespace adjustments do them now
+      if (matches.length > 0) {
+        var len = matches.length, idx;
+        for (idx=0; idx<len; idx++) {
+          var script = findChildById(element, matches[idx][0]),
+              node = document.createTextNode(matches[idx][1]);
+          script.parentNode.insertBefore(node, script);
+        }
+      }
+
+      if (needsShy) {
+        var shyElement = element.firstChild;
+        while (shyElement.nodeType === 1 && !shyElement.nodeName) {
+          shyElement = shyElement.firstChild;
+        }
+        if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
+          shyElement.nodeValue = shyElement.nodeValue.slice(1);
+        }
+      }
+    };
+
+    /* END METAMORPH HELPERS */
+
+
+    var innerHTMLTags = {};
+    var canSetInnerHTML = function(tagName) {
+      if (innerHTMLTags[tagName] !== undefined) {
+        return innerHTMLTags[tagName];
+      }
+
+      var canSet = true;
+
+      // IE 8 and earlier don't allow us to do innerHTML on select
+      if (tagName.toLowerCase() === 'select') {
+        var el = document.createElement('select');
+        setInnerHTMLWithoutFix(el, '<option value="test">Test</option>');
+        canSet = el.options.length === 1;
+      }
+
+      innerHTMLTags[tagName] = canSet;
+
+      return canSet;
+    };
+
+    function setInnerHTML(element, html) {
+      var tagName = element.tagName;
+
+      if (canSetInnerHTML(tagName)) {
+        setInnerHTMLWithoutFix(element, html);
+      } else {
+        // Firefox versions < 11 do not have support for element.outerHTML.
+        var outerHTML = element.outerHTML || new XMLSerializer().serializeToString(element);
+        Ember.assert("Can't set innerHTML on "+element.tagName+" in this browser", outerHTML);
+
+        var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0],
+            endTag = '</'+tagName+'>';
+
+        var wrapper = document.createElement('div');
+        setInnerHTMLWithoutFix(wrapper, startTag + html + endTag);
+        element = wrapper.firstChild;
+        while (element.tagName !== tagName) {
+          element = element.nextSibling;
+        }
+      }
+
+      return element;
+    }
+
+    __exports__.setInnerHTML = setInnerHTML;function isSimpleClick(event) {
+      var modifier = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey,
+          secondaryClick = event.which > 1; // IE9 may return undefined
 
       return !modifier && !secondaryClick;
     }
 
     __exports__.isSimpleClick = isSimpleClick;
   });
-enifed("ember-views/views/collection_view",
-  ["ember-metal/core","ember-metal/platform","ember-metal/binding","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-views/views/container_view","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-handlebars/ext","ember-runtime/mixins/array","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
+define("ember-views/views/collection_view",
+  ["ember-metal/core","ember-metal/platform","ember-metal/binding","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-views/views/container_view","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-runtime/mixins/array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
 
     /**
@@ -39642,8 +37984,7 @@ enifed("ember-views/views/collection_view",
     var View = __dependency10__["default"];
     var observer = __dependency11__.observer;
     var beforeObserver = __dependency11__.beforeObserver;
-    var handlebarsGetView = __dependency12__.handlebarsGetView;
-    var EmberArray = __dependency13__["default"];
+    var EmberArray = __dependency12__["default"];
 
     /**
       `Ember.CollectionView` is an `Ember.View` descendent responsible for managing
@@ -39666,32 +38007,27 @@ enifed("ember-views/views/collection_view",
       The view for each item in the collection will have its `content` property set
       to the item.
 
-      ## Specifying `itemViewClass`
+      ## Specifying itemViewClass
 
       By default the view class for each item in the managed collection will be an
       instance of `Ember.View`. You can supply a different class by setting the
       `CollectionView`'s `itemViewClass` property.
 
-      Given the following application code:
+      Given an empty `<body>` and the following code:
 
       ```javascript
-      var App = Ember.Application.create();
-      App.ItemListView = Ember.CollectionView.extend({
+      someItemsView = Ember.CollectionView.create({
         classNames: ['a-collection'],
         content: ['A','B','C'],
         itemViewClass: Ember.View.extend({
           template: Ember.Handlebars.compile("the letter: {{view.content}}")
         })
       });
+
+      someItemsView.appendTo('body');
       ```
 
-      And a simple application template:
-
-      ```handlebars
-      {{view 'item-list'}}
-      ```
-
-      The following HTML will result:
+      Will result in the following HTML structure
 
       ```html
       <div class="ember-view a-collection">
@@ -39707,26 +38043,21 @@ enifed("ember-views/views/collection_view",
       "ul", "ol", "table", "thead", "tbody", "tfoot", "tr", or "select" will result
       in the item views receiving an appropriately matched `tagName` property.
 
-      Given the following application code:
+      Given an empty `<body>` and the following code:
 
       ```javascript
-      var App = Ember.Application.create();
-      App.UnorderedListView = Ember.CollectionView.create({
+      anUnorderedListView = Ember.CollectionView.create({
         tagName: 'ul',
         content: ['A','B','C'],
         itemViewClass: Ember.View.extend({
           template: Ember.Handlebars.compile("the letter: {{view.content}}")
         })
       });
+
+      anUnorderedListView.appendTo('body');
       ```
 
-      And a simple application template:
-
-      ```handlebars
-      {{view 'unordered-list-view'}}
-      ```
-
-      The following HTML will result:
+      Will result in the following HTML structure
 
       ```html
       <ul class="ember-view a-collection">
@@ -39737,7 +38068,7 @@ enifed("ember-views/views/collection_view",
       ```
 
       Additional `tagName` pairs can be provided by adding to
-      `Ember.CollectionView.CONTAINER_MAP`. For example:
+      `Ember.CollectionView.CONTAINER_MAP `
 
       ```javascript
       Ember.CollectionView.CONTAINER_MAP['article'] = 'section'
@@ -39750,7 +38081,7 @@ enifed("ember-views/views/collection_view",
       `createChildView` method can be overidden:
 
       ```javascript
-      App.CustomCollectionView = Ember.CollectionView.extend({
+      CustomCollectionView = Ember.CollectionView.extend({
         createChildView: function(viewClass, attrs) {
           if (attrs.content.kind == 'album') {
             viewClass = App.AlbumView;
@@ -39770,23 +38101,18 @@ enifed("ember-views/views/collection_view",
       will be the `CollectionView`s only child.
 
       ```javascript
-      var App = Ember.Application.create();
-      App.ListWithNothing = Ember.CollectionView.create({
-        classNames: ['nothing'],
+      aListWithNothing = Ember.CollectionView.create({
+        classNames: ['nothing']
         content: null,
         emptyView: Ember.View.extend({
           template: Ember.Handlebars.compile("The collection is empty")
         })
       });
+
+      aListWithNothing.appendTo('body');
       ```
 
-      And a simple application template:
-
-      ```handlebars
-      {{view 'list-with-nothing'}}
-      ```
-
-      The following HTML will result:
+      Will result in the following HTML structure
 
       ```html
       <div class="ember-view nothing">
@@ -39944,8 +38270,18 @@ enifed("ember-views/views/collection_view",
         // Loop through child views that correspond with the removed items.
         // Note that we loop from the end of the array to the beginning because
         // we are mutating it as we go.
-        var childViews = this._childViews;
-        var childView, idx;
+        var childViews = this._childViews, childView, idx, len;
+
+        len = this._childViews.length;
+
+        var removingAll = removedCount === len;
+
+        if (removingAll) {
+          this.currentState.empty(this);
+          this.invokeRecursively(function(view) {
+            view.removedFromDOM = true;
+          }, false);
+        }
 
         for (idx = start + removedCount - 1; idx >= start; idx--) {
           childView = childViews[idx];
@@ -39968,14 +38304,21 @@ enifed("ember-views/views/collection_view",
         @param {Number} added number of object added to content
       */
       arrayDidChange: function(content, start, removed, added) {
-        var addedViews = [];
-        var view, item, idx, len, itemViewClass, emptyView;
+        var addedViews = [], view, item, idx, len, itemViewClass,
+          emptyView;
 
         len = content ? get(content, 'length') : 0;
 
         if (len) {
           itemViewClass = get(this, 'itemViewClass');
-          itemViewClass = handlebarsGetView(content, itemViewClass, this.container);
+
+          if ('string' === typeof itemViewClass && isGlobalPath(itemViewClass)) {
+            itemViewClass = get(itemViewClass) || itemViewClass;
+          }
+
+          Ember.assert(fmt("itemViewClass must be a subclass of Ember.View, not %@",
+                           [itemViewClass]),
+                           'string' === typeof itemViewClass || View.detect(itemViewClass));
 
           for (idx = start; idx < start+added; idx++) {
             item = content.objectAt(idx);
@@ -40060,7 +38403,7 @@ enifed("ember-views/views/collection_view",
 
     __exports__["default"] = CollectionView;
   });
-enifed("ember-views/views/component",
+define("ember-views/views/component",
   ["ember-metal/core","ember-views/mixins/component_template_deprecation","ember-runtime/mixins/target_action_support","ember-views/views/view","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -40210,8 +38553,8 @@ enifed("ember-views/views/component",
       template: computed(function(key, value) {
         if (value !== undefined) { return value; }
 
-        var templateName = get(this, 'templateName');
-        var template = this.templateForName(templateName, 'template');
+        var templateName = get(this, 'templateName'),
+            template = this.templateForName(templateName, 'template');
 
         Ember.assert("You specified the templateName " + templateName + " for " + this + ", but it did not exist.", !templateName || template);
 
@@ -40236,9 +38579,9 @@ enifed("ember-views/views/component",
       },
 
       _yield: function(context, options) {
-        var view = options.data.view;
-        var parentView = this._parentView;
-        var template = get(this, 'template');
+        var view = options.data.view,
+            parentView = this._parentView,
+            template = get(this, 'template');
 
         if (template) {
           Ember.assert("A Component must have a parent view in order to yield.", parentView);
@@ -40349,8 +38692,8 @@ enifed("ember-views/views/component",
         @param [context] {*} a context to send with the action
       */
       sendAction: function(action) {
-        var actionName;
-        var contexts = a_slice.call(arguments, 1);
+        var actionName,
+            contexts = a_slice.call(arguments, 1);
 
         // Send the default action
         if (action === undefined) {
@@ -40378,9 +38721,9 @@ enifed("ember-views/views/component",
 
     __exports__["default"] = Component;
   });
-enifed("ember-views/views/container_view",
-  ["ember-metal/core","ember-metal/merge","ember-runtime/mixins/mutable_array","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/states","ember-metal/error","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/run_loop","ember-metal/properties","ember-views/system/render_buffer","ember-metal/mixin","ember-runtime/system/native_array","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
+define("ember-views/views/container_view",
+  ["ember-metal/core","ember-metal/merge","ember-runtime/mixins/mutable_array","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/view_collection","ember-views/views/states","ember-metal/error","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/run_loop","ember-metal/properties","ember-views/system/render_buffer","ember-metal/mixin","ember-runtime/system/native_array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert, Ember.K
@@ -40391,21 +38734,22 @@ enifed("ember-views/views/container_view",
     var set = __dependency5__.set;
 
     var View = __dependency6__["default"];
+    var ViewCollection = __dependency7__["default"];
 
-    var cloneStates = __dependency7__.cloneStates;
-    var EmberViewStates = __dependency7__.states;
+    var cloneStates = __dependency8__.cloneStates;
+    var EmberViewStates = __dependency8__.states;
 
-    var EmberError = __dependency8__["default"];
+    var EmberError = __dependency9__["default"];
 
-    var forEach = __dependency9__.forEach;
+    var forEach = __dependency10__.forEach;
 
-    var computed = __dependency10__.computed;
-    var run = __dependency11__["default"];
-    var defineProperty = __dependency12__.defineProperty;
-    var renderBuffer = __dependency13__["default"];
-    var observer = __dependency14__.observer;
-    var beforeObserver = __dependency14__.beforeObserver;
-    var emberA = __dependency15__.A;
+    var computed = __dependency11__.computed;
+    var run = __dependency12__["default"];
+    var defineProperty = __dependency13__.defineProperty;
+    var renderBuffer = __dependency14__["default"];
+    var observer = __dependency15__.observer;
+    var beforeObserver = __dependency15__.beforeObserver;
+    var emberA = __dependency16__.A;
 
     /**
     @module ember
@@ -40565,7 +38909,6 @@ enifed("ember-views/views/container_view",
       @extends Ember.View
     */
     var ContainerView = View.extend(MutableArray, {
-      isContainer: true,
       _states: states,
 
       willWatchProperty: function(prop){
@@ -40644,6 +38987,9 @@ enifed("ember-views/views/container_view",
         @param {Ember.RenderBuffer} buffer the buffer to render to
       */
       render: function(buffer) {
+        this.forEachChildView(function(view) {
+          view.renderToBuffer(buffer);
+        });
       },
 
       instrumentName: 'container',
@@ -40762,40 +39108,69 @@ enifed("ember-views/views/container_view",
       },
 
       ensureChildrenAreInDOM: function(view) {
-        var childViews = view._childViews;
-        var renderer = view._renderer;
+        var childViews = view._childViews, i, len, childView, previous, buffer, viewCollection = new ViewCollection();
 
-        var i, len, childView;
         for (i = 0, len = childViews.length; i < len; i++) {
           childView = childViews[i];
-          if (!childView._elementCreated) {
-            renderer.renderTree(childView, view, i);
+
+          if (!buffer) { buffer = renderBuffer(); buffer._hasElement = false; }
+
+          if (childView.renderToBufferIfNeeded(buffer)) {
+            viewCollection.push(childView);
+          } else if (viewCollection.length) {
+            insertViewCollection(view, viewCollection, previous, buffer);
+            buffer = null;
+            previous = childView;
+            viewCollection.clear();
+          } else {
+            previous = childView;
           }
         }
+
+        if (viewCollection.length) {
+          insertViewCollection(view, viewCollection, previous, buffer);
+        }
       }
     });
 
+    function insertViewCollection(view, viewCollection, previous, buffer) {
+      viewCollection.triggerRecursively('willInsertElement');
+
+      if (previous) {
+        previous.domManager.after(previous, buffer.string());
+      } else {
+        view.domManager.prepend(view, buffer.string());
+      }
+
+      viewCollection.forEach(function(v) {
+        v._transitionTo('inDOM');
+        v.propertyDidChange('element');
+        v.triggerRecursively('didInsertElement');
+      });
+    }
+
+
     __exports__["default"] = ContainerView;
   });
-enifed("ember-views/views/core_view",
-  ["ember-views/system/renderer","ember-views/views/states","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/utils","ember-metal/instrumentation","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+define("ember-views/views/core_view",
+  ["ember-views/views/states","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-metal/property_get","ember-metal/computed","ember-metal/utils","ember-metal/instrumentation","ember-views/system/render_buffer","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
-    var Rerender = __dependency1__["default"];
+    var cloneStates = __dependency1__.cloneStates;
+    var states = __dependency1__.states;
+    var EmberObject = __dependency2__["default"];
+    var Evented = __dependency3__["default"];
+    var ActionHandler = __dependency4__["default"];
 
-    var cloneStates = __dependency2__.cloneStates;
-    var states = __dependency2__.states;
-    var EmberObject = __dependency3__["default"];
-    var Evented = __dependency4__["default"];
-    var ActionHandler = __dependency5__["default"];
+    var get = __dependency5__.get;
+    var computed = __dependency6__.computed;
 
-    var get = __dependency6__.get;
-    var set = __dependency7__.set;
-    var computed = __dependency8__.computed;
+    var typeOf = __dependency7__.typeOf;
 
-    var typeOf = __dependency9__.typeOf;
+    var instrument = __dependency8__.instrument;
 
-    var instrument = __dependency10__.instrument;
+
+    var renderBuffer = __dependency9__["default"];
 
     /**
       `Ember.CoreView` is an abstract class that exists to give view-like behavior
@@ -40814,8 +39189,6 @@ enifed("ember-views/views/core_view",
     */
     var CoreView = EmberObject.extend(Evented, ActionHandler, {
       isView: true,
-      isVirtual: false,
-      isContainer: false,
 
       _states: cloneStates(states),
 
@@ -40861,6 +39234,55 @@ enifed("ember-views/views/core_view",
         hash.view = this;
       },
 
+      /**
+        Invoked by the view system when this view needs to produce an HTML
+        representation. This method will create a new render buffer, if needed,
+        then apply any default attributes, such as class names and visibility.
+        Finally, the `render()` method is invoked, which is responsible for
+        doing the bulk of the rendering.
+
+        You should not need to override this method; instead, implement the
+        `template` property, or if you need more control, override the `render`
+        method.
+
+        @method renderToBuffer
+        @param {Ember.RenderBuffer} buffer the render buffer. If no buffer is
+          passed, a default buffer, using the current view's `tagName`, will
+          be used.
+        @private
+      */
+      renderToBuffer: function(buffer) {
+        var name = 'render.' + this.instrumentName,
+            details = {};
+
+        this.instrumentDetails(details);
+
+        return instrument(name, details, function instrumentRenderToBuffer() {
+          return this._renderToBuffer(buffer);
+        }, this);
+      },
+
+      _renderToBuffer: function(_buffer) {
+        // If this is the top-most view, start a new buffer. Otherwise,
+        // create a new buffer relative to the original using the
+        // provided buffer operation (for example, `insertAfter` will
+        // insert a new buffer after the "parent buffer").
+        var tagName = this.tagName;
+
+        if (tagName === null || tagName === undefined) {
+          tagName = 'div';
+        }
+
+        var buffer = this.buffer = _buffer && _buffer.begin(tagName) || renderBuffer(tagName);
+        this._transitionTo('inBuffer', false);
+
+        this.beforeRender(buffer);
+        this.render(buffer);
+        this.afterRender(buffer);
+
+        return buffer;
+      },
+
       /**
         Override the default event firing from `Ember.Evented` to
         also call methods with the given name.
@@ -40883,6 +39305,18 @@ enifed("ember-views/views/core_view",
         }
       },
 
+      deprecatedSendHandles: function(actionName) {
+        return !!this[actionName];
+      },
+
+      deprecatedSend: function(actionName) {
+        var args = [].slice.call(arguments, 1);
+        Ember.assert('' + this + " has the action " + actionName + " but it is not a function", typeof this[actionName] === 'function');
+        Ember.deprecate('Action handlers implemented directly on views are deprecated in favor of action handlers on an `actions` object ( action: `' + actionName + '` on ' + this + ')', false);
+        this[actionName].apply(this, args);
+        return;
+      },
+
       has: function(name) {
         return typeOf(this[name]) === 'function' || this._super(name);
       },
@@ -40892,12 +39326,9 @@ enifed("ember-views/views/core_view",
 
         if (!this._super()) { return; }
 
-
         // destroy the element -- this will avoid each child view destroying
         // the element over and over again...
-        if (!this.removedFromDOM && this._renderer) {
-          this._renderer.remove(this, true);
-        }
+        if (!this.removedFromDOM) { this.destroyElement(); }
 
         // remove from parent if found. Don't call removeFromParent,
         // as removeFromParent will try to remove the element from
@@ -40910,17 +39341,15 @@ enifed("ember-views/views/core_view",
       },
 
       clearRenderedChildren: Ember.K,
+      triggerRecursively: Ember.K,
+      invokeRecursively: Ember.K,
       _transitionTo: Ember.K,
       destroyElement: Ember.K
     });
 
-    CoreView.reopenClass({
-      renderer: new Rerender()
-    });
-
     __exports__["default"] = CoreView;
   });
-enifed("ember-views/views/states",
+define("ember-views/views/states",
   ["ember-metal/platform","ember-metal/merge","ember-views/views/states/default","ember-views/views/states/pre_render","ember-views/views/states/in_buffer","ember-views/views/states/has_element","ember-views/views/states/in_dom","ember-views/views/states/destroying","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -40961,7 +39390,7 @@ enifed("ember-views/views/states",
     };
     __exports__.states = states;
   });
-enifed("ember-views/views/states/default",
+define("ember-views/views/states/default",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -40996,16 +39425,23 @@ enifed("ember-views/views/states/default",
       },
 
       destroyElement: function(view) {
-        if (view._renderer)
-          view._renderer.remove(view, false);
+        set(view, 'element', null);
+        if (view._scheduledInsert) {
+          run.cancel(view._scheduledInsert);
+          view._scheduledInsert = null;
+        }
         return view;
       },
 
+      renderToBufferIfNeeded: function () {
+        return false;
+      },
+
       rerender: Ember.K,
       invokeObserver: Ember.K
     };
   });
-enifed("ember-views/views/states/destroying",
+define("ember-views/views/states/destroying",
   ["ember-metal/merge","ember-metal/platform","ember-runtime/system/string","ember-views/views/states/default","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -41032,12 +39468,27 @@ enifed("ember-views/views/states/destroying",
       },
       destroyElement: function() {
         throw new EmberError(fmt(destroyingError, ['destroyElement']));
-      }
+      },
+      empty: function() {
+        throw new EmberError(fmt(destroyingError, ['empty']));
+      },
+
+      setElement: function() {
+        throw new EmberError(fmt(destroyingError, ["set('element', ...)"]));
+      },
+
+      renderToBufferIfNeeded: function() {
+        return false;
+      },
+
+      // Since element insertion is scheduled, don't do anything if
+      // the view has been destroyed between scheduling and execution
+      insertElement: Ember.K
     });
 
     __exports__["default"] = destroying;
   });
-enifed("ember-views/views/states/has_element",
+define("ember-views/views/states/has_element",
   ["ember-views/views/states/default","ember-metal/run_loop","ember-metal/merge","ember-metal/platform","ember-views/system/jquery","ember-metal/error","ember-metal/property_get","ember-metal/property_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -41060,7 +39511,7 @@ enifed("ember-views/views/states/has_element",
 
     merge(hasElement, {
       $: function(view, sel) {
-        var elem = view.get('concreteView').element;
+        var elem = get(view, 'element');
         return sel ? jQuery(sel, elem) : jQuery(elem);
       },
 
@@ -41071,17 +39522,25 @@ enifed("ember-views/views/states/has_element",
         return jQuery("#" + get(view, 'elementId'))[0];
       },
 
+      setElement: function(view, value) {
+        if (value === null) {
+          view._transitionTo('preRender');
+        } else {
+          throw new EmberError("You cannot set an element to a non-null value when the element is already in the DOM.");
+        }
+
+        return value;
+      },
+
       // once the view has been inserted into the DOM, rerendering is
       // deferred to allow bindings to synchronize.
       rerender: function(view) {
-        if (view._root._morph && !view._elementInserted) {
-          throw new EmberError("Something you did caused a view to re-render after it rendered but before it was inserted into the DOM.");
-        }
-        // TODO: should be scheduled with renderer
-        run.scheduleOnce('render', function () {
-          if (view.isDestroying) return;
-          view._renderer.renderTree(view, view._parentView);
-        });
+        view.triggerRecursively('willClearRender');
+
+        view.clearRenderedChildren();
+
+        view.domManager.replace(view);
+        return view;
       },
 
       // once the view is already in the DOM, destroying it removes it
@@ -41089,10 +39548,27 @@ enifed("ember-views/views/states/has_element",
       // preRender state if inDOM.
 
       destroyElement: function(view) {
-        view._renderer.remove(view, false);
+        view._notifyWillDestroyElement();
+        view.domManager.remove(view);
+        set(view, 'element', null);
+        if (view._scheduledInsert) {
+          run.cancel(view._scheduledInsert);
+          view._scheduledInsert = null;
+        }
         return view;
       },
 
+      empty: function(view) {
+        var _childViews = view._childViews, len, idx;
+        if (_childViews) {
+          len = _childViews.length;
+          for (idx = 0; idx < len; idx++) {
+            _childViews[idx]._notifyWillDestroyElement();
+          }
+        }
+        view.domManager.empty(view);
+      },
+
       // Handle events from `Ember.EventDispatcher`
       handleEvent: function(view, eventName, evt) {
         if (view.has(eventName)) {
@@ -41111,7 +39587,7 @@ enifed("ember-views/views/states/has_element",
 
     __exports__["default"] = hasElement;
   });
-enifed("ember-views/views/states/in_buffer",
+define("ember-views/views/states/in_buffer",
   ["ember-views/views/states/default","ember-metal/error","ember-metal/core","ember-metal/platform","ember-metal/merge","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -41150,22 +39626,58 @@ enifed("ember-views/views/states/in_buffer",
       // view will render that view and append the resulting
       // buffer into its buffer.
       appendChild: function(view, childView, options) {
-        var buffer = view.buffer;
-        var _childViews = view._childViews;
+        var buffer = view.buffer, _childViews = view._childViews;
 
         childView = view.createChildView(childView, options);
         if (!_childViews.length) { _childViews = view._childViews = _childViews.slice(); }
         _childViews.push(childView);
 
-        if (!childView._morph) {
-          buffer.pushChildView(childView);
-        }
+        childView.renderToBuffer(buffer);
 
         view.propertyDidChange('childViews');
 
         return childView;
       },
 
+      // when a view is rendered in a buffer, destroying the
+      // element will simply destroy the buffer and put the
+      // state back into the preRender state.
+      destroyElement: function(view) {
+        view.clearBuffer();
+        var viewCollection = view._notifyWillDestroyElement();
+        viewCollection.transitionTo('preRender', false);
+
+        return view;
+      },
+
+      empty: function() {
+        Ember.assert("Emptying a view in the inBuffer state is not allowed and " +
+                     "should not happen under normal circumstances. Most likely " +
+                     "there is a bug in your application. This may be due to " +
+                     "excessive property change notifications.");
+      },
+
+      renderToBufferIfNeeded: function (view, buffer) {
+        return false;
+      },
+
+      // It should be impossible for a rendered view to be scheduled for
+      // insertion.
+      insertElement: function() {
+        throw new EmberError("You can't insert an element that has already been rendered");
+      },
+
+      setElement: function(view, value) {
+        if (value === null) {
+          view._transitionTo('preRender');
+        } else {
+          view.clearBuffer();
+          view._transitionTo('hasElement');
+        }
+
+        return value;
+      },
+
       invokeObserver: function(target, observer) {
         observer.call(target);
       }
@@ -41173,7 +39685,7 @@ enifed("ember-views/views/states/in_buffer",
 
     __exports__["default"] = inBuffer;
   });
-enifed("ember-views/views/states/in_dom",
+define("ember-views/views/states/in_dom",
   ["ember-metal/core","ember-metal/platform","ember-metal/merge","ember-metal/error","ember-views/views/states/has_element","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -41213,15 +39725,21 @@ enifed("ember-views/views/states/in_dom",
         if (!View) { View = requireModule('ember-views/views/view')["default"]; } // ES6TODO: this sucks. Have to avoid cycles...
 
         if (!this.isVirtual) delete View.views[view.elementId];
+      },
+
+      insertElement: function(view, fn) {
+        throw new EmberError("You can't insert an element into the DOM that has already been inserted");
       }
     });
 
     __exports__["default"] = inDOM;
   });
-enifed("ember-views/views/states/pre_render",
+define("ember-views/views/states/pre_render",
   ["ember-views/views/states/default","ember-metal/platform","ember-metal/merge","ember-views/system/jquery","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
+    /* global Node */
+
     var _default = __dependency1__["default"];
     var create = __dependency2__.create;
     var merge = __dependency3__["default"];
@@ -41233,10 +39751,44 @@ enifed("ember-views/views/states/pre_render",
     */
     var preRender = create(_default);
 
+    merge(preRender, {
+      // a view leaves the preRender state once its element has been
+      // created (createElement).
+      insertElement: function(view, fn) {
+        view.createElement();
+        var viewCollection = view.viewHierarchyCollection();
+
+        viewCollection.trigger('willInsertElement');
+
+        fn.call(view);
+
+        // We transition to `inDOM` if the element exists in the DOM
+        var element = view.get('element');
+        if (jQuery.contains(document.body, element)) {
+          viewCollection.transitionTo('inDOM', false);
+          viewCollection.trigger('didInsertElement');
+        }
+      },
+
+      renderToBufferIfNeeded: function(view, buffer) {
+        view.renderToBuffer(buffer);
+        return true;
+      },
+
+      empty: Ember.K,
+
+      setElement: function(view, value) {
+        if (value !== null) {
+          view._transitionTo('hasElement');
+        }
+        return value;
+      }
+    });
+
     __exports__["default"] = preRender;
   });
-enifed("ember-views/views/view",
-  ["ember-metal/core","ember-runtime/mixins/evented","ember-runtime/system/object","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/is_none","ember-metal/deprecate_property","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-runtime/copy","ember-metal/binding","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_view","exports"],
+define("ember-views/views/view",
+  ["ember-metal/core","ember-runtime/mixins/evented","ember-runtime/system/object","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/is_none","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-runtime/copy","ember-metal/binding","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_view","ember-views/views/view_collection","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __exports__) {
     "use strict";
     // Ember.assert, Ember.deprecate, Ember.warn, Ember.TEMPLATES,
@@ -41266,36 +39818,47 @@ enifed("ember-views/views/view",
     var isArray = __dependency11__.isArray;
     var isNone = __dependency14__.isNone;
     var Mixin = __dependency13__.Mixin;
-    var deprecateProperty = __dependency15__.deprecateProperty;
-    var emberA = __dependency16__.A;
+    var deprecateProperty = __dependency10__.deprecateProperty;
+    var emberA = __dependency15__.A;
 
-    var dasherize = __dependency17__.dasherize;
+    var dasherize = __dependency16__.dasherize;
 
     // ES6TODO: functions on EnumerableUtils should get their own export
-    var forEach = __dependency18__.forEach;
-    var addObject = __dependency18__.addObject;
-    var removeObject = __dependency18__.removeObject;
+    var forEach = __dependency17__.forEach;
+    var addObject = __dependency17__.addObject;
+    var removeObject = __dependency17__.removeObject;
 
     var beforeObserver = __dependency13__.beforeObserver;
-    var copy = __dependency19__["default"];
-    var isGlobalPath = __dependency20__.isGlobalPath;
+    var copy = __dependency18__["default"];
+    var isGlobalPath = __dependency19__.isGlobalPath;
 
-    var propertyWillChange = __dependency21__.propertyWillChange;
-    var propertyDidChange = __dependency21__.propertyDidChange;
+    var propertyWillChange = __dependency20__.propertyWillChange;
+    var propertyDidChange = __dependency20__.propertyDidChange;
 
-    var jQuery = __dependency22__["default"];
+    var jQuery = __dependency21__["default"];
      // for the side effect of extending Ember.run.queues
 
-    var CoreView = __dependency24__["default"];
+    var CoreView = __dependency23__["default"];
+    var ViewCollection = __dependency24__["default"];
 
     /**
     @module ember
     @submodule ember-views
     */
+
+    var ContainerView;
+
+    function nullViewsBuffer(view) {
+      view.buffer = null;
+
+    }
+
+    function clearCachedElement(view) {
+      meta(view).cache.element = undefined;
+    }
+
     var childViewsProperty = computed(function() {
-      var childViews = this._childViews;
-      var ret = emberA();
-      var view = this;
+      var childViews = this._childViews, ret = emberA(), view = this;
 
       forEach(childViews, function(view) {
         var currentChildViews;
@@ -41309,6 +39872,12 @@ enifed("ember-views/views/view",
       });
 
       ret.replace = function (idx, removedCount, addedViews) {
+        if (!ContainerView) { ContainerView = requireModule('ember-views/views/container_view')['default']; } // ES6TODO: stupid circular dep
+
+        if (view instanceof ContainerView) {
+          Ember.deprecate("Manipulating an Ember.ContainerView through its childViews property is deprecated. Please use the ContainerView instance itself as an Ember.MutableArray.");
+          return view.replace(idx, removedCount, addedViews);
+        }
         throw new EmberError("childViews is immutable");
       };
 
@@ -41827,9 +40396,8 @@ enifed("ember-views/views/view",
       on the descendent.
 
       ```javascript
-      var App = Ember.Application.create();
-      App.OuterView = Ember.View.extend({
-        template: Ember.Handlebars.compile("outer {{#view 'inner'}}inner{{/view}} outer"),
+      OuterView = Ember.View.extend({
+        template: Ember.Handlebars.compile("outer {{#view InnerView}}inner{{/view}} outer"),
         eventManager: Ember.Object.create({
           mouseEnter: function(event, view) {
             // view might be instance of either
@@ -41839,7 +40407,7 @@ enifed("ember-views/views/view",
         })
       });
 
-      App.InnerView = Ember.View.extend({
+      InnerView = Ember.View.extend({
         click: function(event) {
           // will be called if rendered inside
           // an OuterView because OuterView's
@@ -41983,8 +40551,8 @@ enifed("ember-views/views/view",
       template: computed('templateName', function(key, value) {
         if (value !== undefined) { return value; }
 
-        var templateName = get(this, 'templateName');
-        var template = this.templateForName(templateName, 'template');
+        var templateName = get(this, 'templateName'),
+            template = this.templateForName(templateName, 'template');
 
         Ember.assert("You specified the templateName " + templateName + " for " + this + ", but it did not exist.", !templateName || template);
 
@@ -42018,8 +40586,8 @@ enifed("ember-views/views/view",
         @type Function
       */
       layout: computed(function(key) {
-        var layoutName = get(this, 'layoutName');
-        var layout = this.templateForName(layoutName, 'layout');
+        var layoutName = get(this, 'layoutName'),
+            layout = this.templateForName(layoutName, 'layout');
 
         Ember.assert("You specified the layoutName " + layoutName + " for " + this + ", but it did not exist.", !layoutName || layout);
 
@@ -42178,8 +40746,8 @@ enifed("ember-views/views/view",
         @return Ember.View
       */
       nearestOfType: function(klass) {
-        var view = get(this, 'parentView');
-        var isOfType = klass instanceof Mixin ?
+        var view = get(this, 'parentView'),
+            isOfType = klass instanceof Mixin ?
                        function(view) { return klass.detect(view); } :
                        function(view) { return klass.detect(view.constructor); };
 
@@ -42325,6 +40893,21 @@ enifed("ember-views/views/view",
         return this.currentState.rerender(this);
       },
 
+      clearRenderedChildren: function() {
+        var lengthBefore = this.lengthBeforeRender,
+            lengthAfter  = this.lengthAfterRender;
+
+        // If there were child views created during the last call to render(),
+        // remove them under the assumption that they will be re-created when
+        // we re-render.
+
+        // VIEW-TODO: Unit test this path.
+        var childViews = this._childViews;
+        for (var i=lengthAfter-1; i>=lengthBefore; i--) {
+          if (childViews[i]) { childViews[i].destroy(); }
+        }
+      },
+
       /**
         Iterates over the view's `classNameBindings` array, inserts the value
         of the specified property into the `classNames` array, then creates an
@@ -42335,8 +40918,8 @@ enifed("ember-views/views/view",
         @private
       */
       _applyClassNameBindings: function(classBindings) {
-        var classNames = this.classNames;
-        var elem, newClass, dasherizedClass;
+        var classNames = this.classNames,
+        elem, newClass, dasherizedClass;
 
         // Loop through all of the configured bindings. These will be either
         // property names ('isUrgent') or property paths relative to the view
@@ -42415,15 +40998,13 @@ enifed("ember-views/views/view",
         @private
       */
       _applyAttributeBindings: function(buffer, attributeBindings) {
-        var attributeValue;
-        var unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
+        var attributeValue,
+            unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
 
         forEach(attributeBindings, function(binding) {
-          var split = binding.split(':');
-          var property = split[0];
-          var attributeName = split[1] || property;
-
-          Ember.assert('You cannot use class as an attributeBinding, use classNameBindings instead.', attributeName !== 'class');
+          var split = binding.split(':'),
+              property = split[0],
+              attributeName = split[1] || property;
 
           if (property in this) {
             this._setupAttributeBindingObservation(property, attributeName);
@@ -42513,7 +41094,13 @@ enifed("ember-views/views/view",
         @property element
         @type DOMElement
       */
-      element: null,
+      element: computed('_parentView', function(key, value) {
+        if (value !== undefined) {
+          return this.currentState.setElement(this, value);
+        } else {
+          return this.currentState.getElement(this);
+        }
+      }),
 
       /**
         Returns a jQuery object for this view's element. If you pass in a selector
@@ -42532,9 +41119,9 @@ enifed("ember-views/views/view",
       },
 
       mutateChildViews: function(callback) {
-        var childViews = this._childViews;
-        var idx = childViews.length;
-        var view;
+        var childViews = this._childViews,
+            idx = childViews.length,
+            view;
 
         while(--idx >= 0) {
           view = childViews[idx];
@@ -42549,8 +41136,8 @@ enifed("ember-views/views/view",
 
         if (!childViews) { return this; }
 
-        var len = childViews.length;
-        var view, idx;
+        var len = childViews.length,
+            view, idx;
 
         for (idx = 0; idx < len; idx++) {
           view = childViews[idx];
@@ -42580,13 +41167,14 @@ enifed("ember-views/views/view",
         @param {String|DOMElement|jQuery} A selector, element, HTML string, or jQuery object
         @return {Ember.View} receiver
       */
-      appendTo: function(selector) {
-        var target = jQuery(selector);
-
-        Ember.assert("You tried to append to (" + selector + ") but that isn't in the DOM", target.length > 0);
-        Ember.assert("You cannot append to an existing Ember.View. Consider using Ember.ContainerView instead.", !target.is('.ember-view') && !target.parents().is('.ember-view'));
-
-        this.constructor.renderer.appendTo(this, target[0]);
+      appendTo: function(target) {
+        // Schedule the DOM element to be created and appended to the given
+        // element after bindings have synchronized.
+        this._insertElementLater(function() {
+          Ember.assert("You tried to append to (" + target + ") but that isn't in the DOM", jQuery(target).length > 0);
+          Ember.assert("You cannot append to an existing Ember.View. Consider using Ember.ContainerView instead.", !jQuery(target).is('.ember-view') && !jQuery(target).parents().is('.ember-view'));
+          this.$().appendTo(target);
+        });
 
         return this;
       },
@@ -42604,17 +41192,49 @@ enifed("ember-views/views/view",
         @param {String|DOMElement|jQuery} target A selector, element, HTML string, or jQuery object
         @return {Ember.View} received
       */
-      replaceIn: function(selector) {
-        var target = jQuery(selector);
+      replaceIn: function(target) {
+        Ember.assert("You tried to replace in (" + target + ") but that isn't in the DOM", jQuery(target).length > 0);
+        Ember.assert("You cannot replace an existing Ember.View. Consider using Ember.ContainerView instead.", !jQuery(target).is('.ember-view') && !jQuery(target).parents().is('.ember-view'));
 
-        Ember.assert("You tried to replace in (" + selector + ") but that isn't in the DOM", target.length > 0);
-        Ember.assert("You cannot replace an existing Ember.View. Consider using Ember.ContainerView instead.", !target.is('.ember-view') && !target.parents().is('.ember-view'));
-
-        this.constructor.renderer.replaceIn(this, target[0]);
+        this._insertElementLater(function() {
+          jQuery(target).empty();
+          this.$().appendTo(target);
+        });
 
         return this;
       },
 
+      /**
+        Schedules a DOM operation to occur during the next render phase. This
+        ensures that all bindings have finished synchronizing before the view is
+        rendered.
+
+        To use, pass a function that performs a DOM operation.
+
+        Before your function is called, this view and all child views will receive
+        the `willInsertElement` event. After your function is invoked, this view
+        and all of its child views will receive the `didInsertElement` event.
+
+        ```javascript
+        view._insertElementLater(function() {
+          this.createElement();
+          this.$().appendTo('body');
+        });
+        ```
+
+        @method _insertElementLater
+        @param {Function} fn the function that inserts the element into the DOM
+        @private
+      */
+      _insertElementLater: function(fn) {
+        this._scheduledInsert = run.scheduleOnce('render', this, '_insertElement', fn);
+      },
+
+      _insertElement: function (fn) {
+        this._scheduledInsert = null;
+        this.currentState.insertElement(this, fn);
+      },
+
       /**
         Appends the view's element to the document body. If the view does
         not have an HTML representation yet, `createElement()` will be called
@@ -42648,6 +41268,9 @@ enifed("ember-views/views/view",
         // In the interim, we will just re-render if that happens. It is more
         // important than elements get garbage collected.
         if (!this.removedFromDOM) { this.destroyElement(); }
+        this.invokeRecursively(function(view) {
+          if (view.clearRenderedChildren) { view.clearRenderedChildren(); }
+        });
       },
 
       elementId: null,
@@ -42669,20 +41292,20 @@ enifed("ember-views/views/view",
       },
 
       /**
-        Creates a DOM representation of the view and all of its child views by
-        recursively calling the `render()` method.
+        Creates a DOM representation of the view and all of its
+        child views by recursively calling the `render()` method.
 
-        After the element has been inserted into the DOM, `didInsertElement` will
+        After the element has been created, `didInsertElement` will
         be called on this view and all of its child views.
 
         @method createElement
         @return {Ember.View} receiver
       */
       createElement: function() {
-        if (this.element) { return this; }
+        if (get(this, 'element')) { return this; }
 
-        this._didCreateElementWithoutMorph = true;
-        this.constructor.renderer.renderTree(this);
+        var buffer = this.renderToBuffer();
+        set(this, 'element', buffer.element());
 
         return this;
       },
@@ -42699,9 +41322,6 @@ enifed("ember-views/views/view",
         or after the view was re-rendered. Override this function to do any
         set up that requires an element in the document body.
 
-        When a view has children, didInsertElement will be called on the
-        child view(s) first, bubbling upwards through the hierarchy.
-
         @event didInsertElement
       */
       didInsertElement: Ember.K,
@@ -42715,6 +41335,65 @@ enifed("ember-views/views/view",
       */
       willClearRender: Ember.K,
 
+      /**
+        Run this callback on the current view (unless includeSelf is false) and recursively on child views.
+
+        @method invokeRecursively
+        @param fn {Function}
+        @param includeSelf {Boolean} Includes itself if true.
+        @private
+      */
+      invokeRecursively: function(fn, includeSelf) {
+        var childViews = (includeSelf === false) ? this._childViews : [this];
+        var currentViews, view, currentChildViews;
+
+        while (childViews.length) {
+          currentViews = childViews.slice();
+          childViews = [];
+
+          for (var i=0, l=currentViews.length; i<l; i++) {
+            view = currentViews[i];
+            currentChildViews = view._childViews ? view._childViews.slice(0) : null;
+            fn(view);
+            if (currentChildViews) {
+              childViews.push.apply(childViews, currentChildViews);
+            }
+          }
+        }
+      },
+
+      triggerRecursively: function(eventName) {
+        var childViews = [this], currentViews, view, currentChildViews;
+
+        while (childViews.length) {
+          currentViews = childViews.slice();
+          childViews = [];
+
+          for (var i=0, l=currentViews.length; i<l; i++) {
+            view = currentViews[i];
+            currentChildViews = view._childViews ? view._childViews.slice(0) : null;
+            if (view.trigger) { view.trigger(eventName); }
+            if (currentChildViews) {
+              childViews.push.apply(childViews, currentChildViews);
+            }
+
+          }
+        }
+      },
+
+      viewHierarchyCollection: function() {
+        var currentView, viewCollection = new ViewCollection([this]);
+
+        for (var i = 0; i < viewCollection.length; i++) {
+          currentView = viewCollection.objectAt(i);
+          if (currentView._childViews) {
+            viewCollection.push.apply(viewCollection, currentView._childViews);
+          }
+        }
+
+        return viewCollection;
+      },
+
       /**
         Destroys any existing element along with the element for any child views
         as well. If the view does not currently have a element, then this method
@@ -42742,13 +41421,40 @@ enifed("ember-views/views/view",
         this function to do any teardown that requires an element, like removing
         event listeners.
 
-        Please note: any property changes made during this event will have no
-        effect on object observers.
-
         @event willDestroyElement
       */
       willDestroyElement: Ember.K,
 
+      /**
+        Triggers the `willDestroyElement` event (which invokes the
+        `willDestroyElement()` method if it exists) on this view and all child
+        views.
+
+        Before triggering `willDestroyElement`, it first triggers the
+        `willClearRender` event recursively.
+
+        @method _notifyWillDestroyElement
+        @private
+      */
+      _notifyWillDestroyElement: function() {
+        var viewCollection = this.viewHierarchyCollection();
+        viewCollection.trigger('willClearRender');
+        viewCollection.trigger('willDestroyElement');
+        return viewCollection;
+      },
+
+      /**
+        If this view's element changes, we need to invalidate the caches of our
+        child views so that we do not retain references to DOM elements that are
+        no longer needed.
+
+        @method _elementDidChange
+        @private
+      */
+      _elementDidChange: observer('element', function() {
+        this.forEachChildView(clearCachedElement);
+      }),
+
       /**
         Called when the parentView property has changed.
 
@@ -42763,9 +41469,26 @@ enifed("ember-views/views/view",
         this._super(hash);
       },
 
-      beforeRender: function(buffer) {},
+      _renderToBuffer: function(buffer) {
+        this.lengthBeforeRender = this._childViews.length;
+        buffer = this._super(buffer);
+        this.lengthAfterRender = this._childViews.length;
 
-      afterRender: function(buffer) {},
+        return buffer;
+      },
+
+      renderToBufferIfNeeded: function (buffer) {
+        return this.currentState.renderToBufferIfNeeded(this, buffer);
+      },
+
+      beforeRender: function(buffer) {
+        this.applyAttributesToBuffer(buffer);
+        buffer.pushOpeningTag();
+      },
+
+      afterRender: function(buffer) {
+        buffer.pushClosingTag();
+      },
 
       applyAttributesToBuffer: function(buffer) {
         // Creates observers for all registered class name and attribute bindings,
@@ -42928,9 +41651,7 @@ enifed("ember-views/views/view",
         @private
       */
       init: function() {
-        if (!this.isVirtual && !this.elementId) {
-          this.elementId = guidFor(this);
-        }
+        this.elementId = this.elementId || guidFor(this);
 
         this._super();
 
@@ -43018,19 +41739,29 @@ enifed("ember-views/views/view",
         @method destroy
       */
       destroy: function() {
-        var childViews = this._childViews;
-        // get parentView before calling super because it'll be destroyed
-        var nonVirtualParentView = get(this, 'parentView');
-        var viewName = this.viewName;
-        var childLen, i;
+        var childViews = this._childViews,
+            // get parentView before calling super because it'll be destroyed
+            nonVirtualParentView = get(this, 'parentView'),
+            viewName = this.viewName,
+            childLen, i;
 
         if (!this._super()) { return; }
 
+        childLen = childViews.length;
+        for (i=childLen-1; i>=0; i--) {
+          childViews[i].removedFromDOM = true;
+        }
+
         // remove from non-virtual parent view if viewName was specified
         if (viewName && nonVirtualParentView) {
           nonVirtualParentView.set(viewName, null);
         }
 
+        childLen = childViews.length;
+        for (i=childLen-1; i>=0; i--) {
+          childViews[i].destroy();
+        }
+
         return this;
       },
 
@@ -43109,18 +41840,16 @@ enifed("ember-views/views/view",
 
       _toggleVisibility: function() {
         var $el = this.$();
+        if (!$el) { return; }
+
         var isVisible = get(this, 'isVisible');
 
         if (this._isVisible === isVisible) { return ; }
 
-        // It's important to keep these in sync, even if we don't yet have
-        // an element in the DOM to manipulate:
-        this._isVisible = isVisible;
-
-        if (!$el) { return; }
-
         $el.toggle(isVisible);
 
+        this._isVisible = isVisible;
+
         if (this._isAncestorHidden()) { return; }
 
         if (isVisible) {
@@ -43164,6 +41893,10 @@ enifed("ember-views/views/view",
 
         return false;
       },
+
+      clearBuffer: function() {
+        this.invokeRecursively(nullViewsBuffer);
+      },
       transitionTo: function(state, children) {
         Ember.deprecate("Ember.View#transitionTo has been deprecated, it is for internal use only");
         this._transitionTo(state, children);
@@ -43171,10 +41904,18 @@ enifed("ember-views/views/view",
       _transitionTo: function(state, children) {
         var priorState = this.currentState;
         var currentState = this.currentState = this._states[state];
+
         this._state = state;
 
         if (priorState && priorState.exit) { priorState.exit(this); }
         if (currentState.enter) { currentState.enter(this); }
+        if (state === 'inDOM') { meta(this).cache.element = undefined; }
+
+        if (children !== false) {
+          this.forEachChildView(function(view) {
+            view._transitionTo(state);
+          });
+        }
       },
 
       // .......................................................
@@ -43203,13 +41944,13 @@ enifed("ember-views/views/view",
           return;
         }
 
-        var view = this;
-        var stateCheckedObserver = function() {
-          view.currentState.invokeObserver(this, observer);
-        };
-        var scheduledObserver = function() {
-          run.scheduleOnce('render', this, stateCheckedObserver);
-        };
+        var view = this,
+            stateCheckedObserver = function() {
+              view.currentState.invokeObserver(this, observer);
+            },
+            scheduledObserver = function() {
+              run.scheduleOnce('render', this, stateCheckedObserver);
+            };
 
         addObserver(root, path, target, scheduledObserver);
 
@@ -43253,6 +41994,48 @@ enifed("ember-views/views/view",
       run.once(View, 'notifyMutationListeners');
     }
 
+    var DOMManager = {
+      prepend: function(view, html) {
+        view.$().prepend(html);
+        notifyMutationListeners();
+      },
+
+      after: function(view, html) {
+        view.$().after(html);
+        notifyMutationListeners();
+      },
+
+      html: function(view, html) {
+        view.$().html(html);
+        notifyMutationListeners();
+      },
+
+      replace: function(view) {
+        var element = get(view, 'element');
+
+        set(view, 'element', null);
+
+        view._insertElementLater(function() {
+          jQuery(element).replaceWith(get(view, 'element'));
+          notifyMutationListeners();
+        });
+      },
+
+      remove: function(view) {
+        view.$().remove();
+        notifyMutationListeners();
+      },
+
+      empty: function(view) {
+        view.$().empty();
+        notifyMutationListeners();
+      }
+    };
+
+    View.reopen({
+      domManager: DOMManager
+    });
+
     View.reopenClass({
 
       /**
@@ -43275,10 +42058,11 @@ enifed("ember-views/views/view",
         @private
       */
       _parsePropertyPath: function(path) {
-        var split = path.split(':');
-        var propertyPath = split[0];
-        var classNames = "";
-        var className, falsyClassName;
+        var split = path.split(':'),
+            propertyPath = split[0],
+            classNames = "",
+            className,
+            falsyClassName;
 
         // check if the property is defined as prop:class or prop:trueClass:falseClass
         if (split.length > 1) {
@@ -43362,7 +42146,7 @@ enifed("ember-views/views/view",
     });
 
     var mutation = EmberObject.extend(Evented).create();
-    // TODO MOVE TO RENDERER HOOKS
+
     View.addMutationListener = function(callback) {
       mutation.on('change', callback);
     };
@@ -43420,11 +42204,82 @@ enifed("ember-views/views/view",
 
     __exports__["default"] = View;
   });
-enifed("ember",
+define("ember-views/views/view_collection",
+  ["ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var forEach = __dependency1__.forEach;
+
+    function ViewCollection(initialViews) {
+      var views = this.views = initialViews || [];
+      this.length = views.length;
+    }
+
+    ViewCollection.prototype = {
+      length: 0,
+
+      trigger: function(eventName) {
+        var views = this.views, view;
+        for (var i = 0, l = views.length; i < l; i++) {
+          view = views[i];
+          if (view.trigger) { view.trigger(eventName); }
+        }
+      },
+
+      triggerRecursively: function(eventName) {
+        var views = this.views;
+        for (var i = 0, l = views.length; i < l; i++) {
+          views[i].triggerRecursively(eventName);
+        }
+      },
+
+      invokeRecursively: function(fn) {
+        var views = this.views, view;
+
+        for (var i = 0, l = views.length; i < l; i++) {
+          view = views[i];
+          fn(view);
+        }
+      },
+
+      transitionTo: function(state, children) {
+        var views = this.views;
+        for (var i = 0, l = views.length; i < l; i++) {
+          views[i]._transitionTo(state, children);
+        }
+      },
+
+      push: function() {
+        this.length += arguments.length;
+        var views = this.views;
+        return views.push.apply(views, arguments);
+      },
+
+      objectAt: function(idx) {
+        return this.views[idx];
+      },
+
+      forEach: function(callback) {
+        var views = this.views;
+        return forEach(views, callback);
+      },
+
+      clear: function() {
+        this.length = 0;
+        this.views.length = 0;
+      }
+    };
+
+    __exports__["default"] = ViewCollection;
+  });
+define("ember",
   ["ember-metal","ember-runtime","ember-handlebars","ember-views","ember-routing","ember-routing-handlebars","ember-application","ember-extension-support"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
-    "use strict";
-    /* global navigator */
+        // Remove "use strict"; from transpiled module until
+    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+    //
+    // REMOVE_USE_STRICT: true
+
     // require the main entry points for each of these packages
     // this is so that the global exports occur properly
 
@@ -43440,831 +42295,521 @@ enifed("ember",
     @module ember
     */
 
-    Ember.deprecate('Usage of Ember is deprecated for Internet Explorer 6 and 7, support will be removed in the next major version.', !navigator.userAgent.match(/MSIE [67]/));
+    function throwWithMessage(msg) {
+      return function() {
+        throw new Ember.Error(msg);
+      };
+    }
+
+    function generateRemovedClass(className) {
+      var msg = " has been moved into a plugin: https://github.com/emberjs/ember-states";
+
+      return {
+        extend: throwWithMessage(className + msg),
+        create: throwWithMessage(className + msg)
+      };
+    }
+
+    Ember.StateManager = generateRemovedClass("Ember.StateManager");
+
+    /**
+      This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
+
+      @class StateManager
+      @namespace Ember
+    */
+
+    Ember.State = generateRemovedClass("Ember.State");
+
+    /**
+      This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
+
+      @class State
+      @namespace Ember
+    */
   });
-enifed("morph",
-  ["./morph/morph","./morph/dom-helper","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+define("metamorph",
+  [],
+  function() {
     "use strict";
-    var Morph = __dependency1__["default"];
-    var Morph;
-    __exports__.Morph = Morph;
-    var DOMHelper = __dependency2__["default"];
-    var DOMHelper;
-    __exports__.DOMHelper = DOMHelper;
-  });
-enifed("morph/dom-helper",
-  ["../morph/morph","./dom-helper/build-html-dom","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
-    "use strict";
-    var Morph = __dependency1__["default"];
-    var buildHTMLDOM = __dependency2__.buildHTMLDOM;
-    var svgNamespace = __dependency2__.svgNamespace;
-    var svgHTMLIntegrationPoints = __dependency2__.svgHTMLIntegrationPoints;
+    // ==========================================================================
+    // Project:   metamorph
+    // Copyright: ©2014 Tilde, Inc. All rights reserved.
+    // ==========================================================================
 
-    var deletesBlankTextNodes = (function(){
-      var element = document.createElement('div');
-      element.appendChild( document.createTextNode('') );
-      var clonedElement = element.cloneNode(true);
-      return clonedElement.childNodes.length === 0;
-    })();
-
-    var ignoresCheckedAttribute = (function(){
-      var element = document.createElement('input');
-      element.setAttribute('checked', 'checked');
-      var clonedElement = element.cloneNode(false);
-      return !clonedElement.checked;
-    })();
-
-    function isSVG(ns){
-      return ns === svgNamespace;
-    }
-
-    // This is not the namespace of the element, but of
-    // the elements inside that elements.
-    function interiorNamespace(element){
-      if (
-        element &&
-        element.namespaceURI === svgNamespace &&
-        !svgHTMLIntegrationPoints[element.tagName]
-      ) {
-        return svgNamespace;
-      } else {
-        return null;
-      }
-    }
-
-    // The HTML spec allows for "omitted start tags". These tags are optional
-    // when their intended child is the first thing in the parent tag. For
-    // example, this is a tbody start tag:
-    //
-    // <table>
-    //   <tbody>
-    //     <tr>
-    //
-    // The tbody may be omitted, and the browser will accept and render:
-    //
-    // <table>
-    //   <tr>
-    //
-    // However, the omitted start tag will still be added to the DOM. Here
-    // we test the string and context to see if the browser is about to
-    // perform this cleanup.
-    //
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags
-    // describes which tags are omittable. The spec for tbody and colgroup
-    // explains this behavior:
-    //
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-tbody-element
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-colgroup-element
-    //
-
-    var omittedStartTagChildTest = /<([\w:]+)/;
-    function detectOmittedStartTag(string, contextualElement){
-      // Omitted start tags are only inside table tags.
-      if (contextualElement.tagName === 'TABLE') {
-        var omittedStartTagChildMatch = omittedStartTagChildTest.exec(string);
-        if (omittedStartTagChildMatch) {
-          var omittedStartTagChild = omittedStartTagChildMatch[1];
-          // It is already asserted that the contextual element is a table
-          // and not the proper start tag. Just see if a tag was omitted.
-          return omittedStartTagChild === 'tr' ||
-                 omittedStartTagChild === 'col';
-        }
-      }
-    }
-
-    function buildSVGDOM(html, dom){
-      var div = dom.document.createElement('div');
-      div.innerHTML = '<svg>'+html+'</svg>';
-      return div.firstChild.childNodes;
-    }
-
-    /*
-     * A class wrapping DOM functions to address environment compatibility,
-     * namespaces, contextual elements for morph un-escaped content
-     * insertion.
-     *
-     * When entering a template, a DOMHelper should be passed:
-     *
-     *   template(context, { hooks: hooks, dom: new DOMHelper() });
-     *
-     * TODO: support foreignObject as a passed contextual element. It has
-     * a namespace (svg) that does not match its internal namespace
-     * (xhtml).
-     *
-     * @class DOMHelper
-     * @constructor
-     * @param {HTMLDocument} _document The document DOM methods are proxied to
-     */
-    function DOMHelper(_document){
-      this.document = _document || window.document;
-      this.namespace = null;
-    }
-
-    var prototype = DOMHelper.prototype;
-    prototype.constructor = DOMHelper;
-
-    prototype.insertBefore = function(element, childElement, referenceChild) {
-      return element.insertBefore(childElement, referenceChild);
-    };
-
-    prototype.appendChild = function(element, childElement) {
-      return element.appendChild(childElement);
-    };
-
-    prototype.appendText = function(element, text) {
-      return element.appendChild(this.document.createTextNode(text));
-    };
-
-    prototype.setAttribute = function(element, name, value) {
-      element.setAttribute(name, value);
-    };
-
-    if (document.createElementNS) {
-      // Only opt into namespace detection if a contextualElement
-      // is passed.
-      prototype.createElement = function(tagName, contextualElement) {
-        var namespace = this.namespace;
-        if (contextualElement) {
-          if (tagName === 'svg') {
-            namespace = svgNamespace;
+    var K = function() {},
+        guid = 0,
+        disableRange = (function(){
+          if ('undefined' !== typeof MetamorphENV) {
+            return MetamorphENV.DISABLE_RANGE_API;
+          } else if ('undefined' !== ENV) {
+            return ENV.DISABLE_RANGE_API;
           } else {
-            namespace = interiorNamespace(contextualElement);
+            return false;
           }
-        }
-        if (namespace) {
-          return this.document.createElementNS(namespace, tagName);
+        })(),
+
+        // Feature-detect the W3C range API, the extended check is for IE9 which only partially supports ranges
+        supportsRange = (!disableRange) && typeof document !== 'undefined' && ('createRange' in document) && (typeof Range !== 'undefined') && Range.prototype.createContextualFragment,
+
+        // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
+        // is a "zero-scope" element. This problem can be worked around by making
+        // the first node an invisible text node. We, like Modernizr, use &shy;
+        needsShy = typeof document !== 'undefined' && (function() {
+          var testEl = document.createElement('div');
+          testEl.innerHTML = "<div></div>";
+          testEl.firstChild.innerHTML = "<script></script>";
+          return testEl.firstChild.innerHTML === '';
+        })(),
+
+
+        // IE 8 (and likely earlier) likes to move whitespace preceeding
+        // a script tag to appear after it. This means that we can
+        // accidentally remove whitespace when updating a morph.
+        movesWhitespace = document && (function() {
+          var testEl = document.createElement('div');
+          testEl.innerHTML = "Test: <script type='text/x-placeholder'></script>Value";
+          return testEl.childNodes[0].nodeValue === 'Test:' &&
+                  testEl.childNodes[2].nodeValue === ' Value';
+        })();
+
+    // Constructor that supports either Metamorph('foo') or new
+    // Metamorph('foo');
+    //
+    // Takes a string of HTML as the argument.
+
+    var Metamorph = function(html) {
+      var self;
+
+      if (this instanceof Metamorph) {
+        self = this;
+      } else {
+        self = new K();
+      }
+
+      self.innerHTML = html;
+      var myGuid = 'metamorph-'+(guid++);
+      self.start = myGuid + '-start';
+      self.end = myGuid + '-end';
+
+      return self;
+    };
+
+    K.prototype = Metamorph.prototype;
+
+    var rangeFor, htmlFunc, removeFunc, outerHTMLFunc, appendToFunc, afterFunc, prependFunc, startTagFunc, endTagFunc;
+
+    outerHTMLFunc = function() {
+      return this.startTag() + this.innerHTML + this.endTag();
+    };
+
+    startTagFunc = function() {
+      /*
+       * We replace chevron by its hex code in order to prevent escaping problems.
+       * Check this thread for more explaination:
+       * http://stackoverflow.com/questions/8231048/why-use-x3c-instead-of-when-generating-html-from-javascript
+       */
+      return "<script id='" + this.start + "' type='text/x-placeholder'>\x3C/script>";
+    };
+
+    endTagFunc = function() {
+      /*
+       * We replace chevron by its hex code in order to prevent escaping problems.
+       * Check this thread for more explaination:
+       * http://stackoverflow.com/questions/8231048/why-use-x3c-instead-of-when-generating-html-from-javascript
+       */
+      return "<script id='" + this.end + "' type='text/x-placeholder'>\x3C/script>";
+    };
+
+    // If we have the W3C range API, this process is relatively straight forward.
+    if (supportsRange) {
+
+      // Get a range for the current morph. Optionally include the starting and
+      // ending placeholders.
+      rangeFor = function(morph, outerToo) {
+        var range = document.createRange();
+        var before = document.getElementById(morph.start);
+        var after = document.getElementById(morph.end);
+
+        if (outerToo) {
+          range.setStartBefore(before);
+          range.setEndAfter(after);
         } else {
-          return this.document.createElement(tagName);
+          range.setStartAfter(before);
+          range.setEndBefore(after);
+        }
+
+        return range;
+      };
+
+      htmlFunc = function(html, outerToo) {
+        // get a range for the current metamorph object
+        var range = rangeFor(this, outerToo);
+
+        // delete the contents of the range, which will be the
+        // nodes between the starting and ending placeholder.
+        range.deleteContents();
+
+        // create a new document fragment for the HTML
+        var fragment = range.createContextualFragment(html);
+
+        // insert the fragment into the range
+        range.insertNode(fragment);
+      };
+
+      /**
+      * @public
+      *
+      * Remove this object (including starting and ending
+      * placeholders).
+      *
+      * @method remove
+      */
+      removeFunc = function() {
+        // get a range for the current metamorph object including
+        // the starting and ending placeholders.
+        var range = rangeFor(this, true);
+
+        // delete the entire range.
+        range.deleteContents();
+      };
+
+      appendToFunc = function(node) {
+        var range = document.createRange();
+        range.setStart(node);
+        range.collapse(false);
+        var frag = range.createContextualFragment(this.outerHTML());
+        node.appendChild(frag);
+      };
+
+      afterFunc = function(html) {
+        var range = document.createRange();
+        var after = document.getElementById(this.end);
+
+        range.setStartAfter(after);
+        range.setEndAfter(after);
+
+        var fragment = range.createContextualFragment(html);
+        range.insertNode(fragment);
+      };
+
+      prependFunc = function(html) {
+        var range = document.createRange();
+        var start = document.getElementById(this.start);
+
+        range.setStartAfter(start);
+        range.setEndAfter(start);
+
+        var fragment = range.createContextualFragment(html);
+        range.insertNode(fragment);
+      };
+
+    } else {
+      /*
+       * This code is mostly taken from jQuery, with one exception. In jQuery's case, we
+       * have some HTML and we need to figure out how to convert it into some nodes.
+       *
+       * In this case, jQuery needs to scan the HTML looking for an opening tag and use
+       * that as the key for the wrap map. In our case, we know the parent node, and
+       * can use its type as the key for the wrap map.
+       **/
+      Metamorph._wrapMap = {
+        select: [ 1, "<select multiple='multiple'>", "</select>" ],
+        fieldset: [ 1, "<fieldset>", "</fieldset>" ],
+        table: [ 1, "<table>", "</table>" ],
+        tbody: [ 2, "<table><tbody>", "</tbody></table>" ],
+        tr: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+        colgroup: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+        map: [ 1, "<map>", "</map>" ],
+        _default: [ 0, "", "" ]
+      };
+
+      var findChildById = function(element, id) {
+        if (element.getAttribute('id') === id) { return element; }
+
+        var len = element.childNodes.length, idx, node, found;
+        for (idx=0; idx<len; idx++) {
+          node = element.childNodes[idx];
+          found = node.nodeType === 1 && findChildById(node, id);
+          if (found) { return found; }
         }
       };
-    } else {
-      prototype.createElement = function(tagName) {
-        return this.document.createElement(tagName);
+
+      var setInnerHTML = function(element, html) {
+        var matches = [];
+        if (movesWhitespace) {
+          // Right now we only check for script tags with ids with the
+          // goal of targeting morphs.
+          html = html.replace(/(\s+)(<script id='([^']+)')/g, function(match, spaces, tag, id) {
+            matches.push([id, spaces]);
+            return tag;
+          });
+        }
+
+        element.innerHTML = html;
+
+        // If we have to do any whitespace adjustments do them now
+        if (matches.length > 0) {
+          var len = matches.length, idx;
+          for (idx=0; idx<len; idx++) {
+            var script = findChildById(element, matches[idx][0]),
+                node = document.createTextNode(matches[idx][1]);
+            script.parentNode.insertBefore(node, script);
+          }
+        }
+      };
+
+      /*
+       * Given a parent node and some HTML, generate a set of nodes. Return the first
+       * node, which will allow us to traverse the rest using nextSibling.
+       *
+       * We need to do this because innerHTML in IE does not really parse the nodes.
+       */
+      var firstNodeFor = function(parentNode, html) {
+        var wrapMap = Metamorph._wrapMap;
+        var arr = wrapMap[parentNode.tagName.toLowerCase()] || wrapMap._default;
+        var depth = arr[0], start = arr[1], end = arr[2];
+
+        if (needsShy) { html = '&shy;'+html; }
+
+        var element = document.createElement('div');
+
+        setInnerHTML(element, start + html + end);
+
+        for (var i=0; i<=depth; i++) {
+          element = element.firstChild;
+        }
+
+        // Look for &shy; to remove it.
+        if (needsShy) {
+          var shyElement = element;
+
+          // Sometimes we get nameless elements with the shy inside
+          while (shyElement.nodeType === 1 && !shyElement.nodeName) {
+            shyElement = shyElement.firstChild;
+          }
+
+          // At this point it's the actual unicode character.
+          if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
+            shyElement.nodeValue = shyElement.nodeValue.slice(1);
+          }
+        }
+
+        return element;
+      };
+
+      /*
+       * In some cases, Internet Explorer can create an anonymous node in
+       * the hierarchy with no tagName. You can create this scenario via:
+       *
+       *     div = document.createElement("div");
+       *     div.innerHTML = "<table>&shy<script></script><tr><td>hi</td></tr></table>";
+       *     div.firstChild.firstChild.tagName //=> ""
+       *
+       * If our script markers are inside such a node, we need to find that
+       * node and use *it* as the marker.
+       */
+      var realNode = function(start) {
+        while (start.parentNode.tagName === "") {
+          start = start.parentNode;
+        }
+
+        return start;
+      };
+
+      /*
+       * When automatically adding a tbody, Internet Explorer inserts the
+       * tbody immediately before the first <tr>. Other browsers create it
+       * before the first node, no matter what.
+       *
+       * This means the the following code:
+       *
+       *     div = document.createElement("div");
+       *     div.innerHTML = "<table><script id='first'></script><tr><td>hi</td></tr><script id='last'></script></table>
+       *
+       * Generates the following DOM in IE:
+       *
+       *     + div
+       *       + table
+       *         - script id='first'
+       *         + tbody
+       *           + tr
+       *             + td
+       *               - "hi"
+       *           - script id='last'
+       *
+       * Which means that the two script tags, even though they were
+       * inserted at the same point in the hierarchy in the original
+       * HTML, now have different parents.
+       *
+       * This code reparents the first script tag by making it the tbody's
+       * first child.
+       *
+       */
+      var fixParentage = function(start, end) {
+        if (start.parentNode !== end.parentNode) {
+          end.parentNode.insertBefore(start, end.parentNode.firstChild);
+        }
+      };
+
+      htmlFunc = function(html, outerToo) {
+        // get the real starting node. see realNode for details.
+        var start = realNode(document.getElementById(this.start));
+        var end = document.getElementById(this.end);
+        var parentNode = end.parentNode;
+        var node, nextSibling, last;
+
+        // make sure that the start and end nodes share the same
+        // parent. If not, fix it.
+        fixParentage(start, end);
+
+        // remove all of the nodes after the starting placeholder and
+        // before the ending placeholder.
+        node = start.nextSibling;
+        while (node) {
+          nextSibling = node.nextSibling;
+          last = node === end;
+
+          // if this is the last node, and we want to remove it as well,
+          // set the `end` node to the next sibling. This is because
+          // for the rest of the function, we insert the new nodes
+          // before the end (note that insertBefore(node, null) is
+          // the same as appendChild(node)).
+          //
+          // if we do not want to remove it, just break.
+          if (last) {
+            if (outerToo) { end = node.nextSibling; } else { break; }
+          }
+
+          node.parentNode.removeChild(node);
+
+          // if this is the last node and we didn't break before
+          // (because we wanted to remove the outer nodes), break
+          // now.
+          if (last) { break; }
+
+          node = nextSibling;
+        }
+
+        // get the first node for the HTML string, even in cases like
+        // tables and lists where a simple innerHTML on a div would
+        // swallow some of the content.
+        node = firstNodeFor(start.parentNode, html);
+
+        if (outerToo) {
+          start.parentNode.removeChild(start);
+        }
+
+        // copy the nodes for the HTML between the starting and ending
+        // placeholder.
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.insertBefore(node, end);
+          node = nextSibling;
+        }
+      };
+
+      // remove the nodes in the DOM representing this metamorph.
+      //
+      // this includes the starting and ending placeholders.
+      removeFunc = function() {
+        var start = realNode(document.getElementById(this.start));
+        var end = document.getElementById(this.end);
+
+        this.html('');
+        start.parentNode.removeChild(start);
+        end.parentNode.removeChild(end);
+      };
+
+      appendToFunc = function(parentNode) {
+        var node = firstNodeFor(parentNode, this.outerHTML());
+        var nextSibling;
+
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.appendChild(node);
+          node = nextSibling;
+        }
+      };
+
+      afterFunc = function(html) {
+        // get the real starting node. see realNode for details.
+        var end = document.getElementById(this.end);
+        var insertBefore = end.nextSibling;
+        var parentNode = end.parentNode;
+        var nextSibling;
+        var node;
+
+        // get the first node for the HTML string, even in cases like
+        // tables and lists where a simple innerHTML on a div would
+        // swallow some of the content.
+        node = firstNodeFor(parentNode, html);
+
+        // copy the nodes for the HTML between the starting and ending
+        // placeholder.
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.insertBefore(node, insertBefore);
+          node = nextSibling;
+        }
+      };
+
+      prependFunc = function(html) {
+        var start = document.getElementById(this.start);
+        var parentNode = start.parentNode;
+        var nextSibling;
+        var node;
+
+        node = firstNodeFor(parentNode, html);
+        var insertBefore = start.nextSibling;
+
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.insertBefore(node, insertBefore);
+          node = nextSibling;
+        }
       };
     }
 
-    prototype.setNamespace = function(ns) {
-      this.namespace = ns;
+    Metamorph.prototype.html = function(html) {
+      this.checkRemoved();
+      if (html === undefined) { return this.innerHTML; }
+
+      htmlFunc.call(this, html);
+
+      this.innerHTML = html;
     };
 
-    prototype.detectNamespace = function(element) {
-      this.namespace = interiorNamespace(element);
+    Metamorph.prototype.replaceWith = function(html) {
+      this.checkRemoved();
+      htmlFunc.call(this, html, true);
     };
 
-    prototype.createDocumentFragment = function(){
-      return this.document.createDocumentFragment();
+    Metamorph.prototype.remove = removeFunc;
+    Metamorph.prototype.outerHTML = outerHTMLFunc;
+    Metamorph.prototype.appendTo = appendToFunc;
+    Metamorph.prototype.after = afterFunc;
+    Metamorph.prototype.prepend = prependFunc;
+    Metamorph.prototype.startTag = startTagFunc;
+    Metamorph.prototype.endTag = endTagFunc;
+
+    Metamorph.prototype.isRemoved = function() {
+      var before = document.getElementById(this.start);
+      var after = document.getElementById(this.end);
+
+      return !before || !after;
     };
 
-    prototype.createTextNode = function(text){
-      return this.document.createTextNode(text);
-    };
-
-    prototype.repairClonedNode = function(element, blankChildTextNodes, isChecked){
-      if (deletesBlankTextNodes && blankChildTextNodes.length > 0) {
-        for (var i=0, len=blankChildTextNodes.length;i<len;i++){
-          var textNode = this.document.createTextNode(''),
-              offset = blankChildTextNodes[i],
-              before = element.childNodes[offset];
-          if (before) {
-            element.insertBefore(textNode, before);
-          } else {
-            element.appendChild(textNode);
-          }
-        }
-      }
-      if (ignoresCheckedAttribute && isChecked) {
-        element.setAttribute('checked', 'checked');
+    Metamorph.prototype.checkRemoved = function() {
+      if (this.isRemoved()) {
+        throw new Error("Cannot perform operations on a Metamorph that is not in the DOM.");
       }
     };
 
-    prototype.cloneNode = function(element, deep){
-      var clone = element.cloneNode(!!deep);
-      return clone;
-    };
-
-    prototype.createMorph = function(parent, start, end, contextualElement){
-      if (!contextualElement && parent.nodeType === 1) {
-        contextualElement = parent;
-      }
-      return new Morph(parent, start, end, this, contextualElement);
-    };
-
-    // This helper is just to keep the templates good looking,
-    // passing integers instead of element references.
-    prototype.createMorphAt = function(parent, startIndex, endIndex, contextualElement){
-      var childNodes = parent.childNodes,
-          start = startIndex === -1 ? null : childNodes[startIndex],
-          end = endIndex === -1 ? null : childNodes[endIndex];
-      return this.createMorph(parent, start, end, contextualElement);
-    };
-
-    prototype.insertMorphBefore = function(element, referenceChild, contextualElement) {
-      var start = this.document.createTextNode('');
-      var end = this.document.createTextNode('');
-      element.insertBefore(start, referenceChild);
-      element.insertBefore(end, referenceChild);
-      return this.createMorph(element, start, end, contextualElement);
-    };
-
-    prototype.appendMorph = function(element, contextualElement) {
-      var start = this.document.createTextNode('');
-      var end = this.document.createTextNode('');
-      element.appendChild(start);
-      element.appendChild(end);
-      return this.createMorph(element, start, end, contextualElement);
-    };
-
-    prototype.parseHTML = function(html, contextualElement) {
-      var isSVGContent = (
-        isSVG(this.namespace) &&
-        !svgHTMLIntegrationPoints[contextualElement.tagName]
-      );
-
-      if (isSVGContent) {
-        return buildSVGDOM(html, this);
-      } else {
-        var nodes = buildHTMLDOM(html, contextualElement, this);
-        if (detectOmittedStartTag(html, contextualElement)) {
-          var node = nodes[0];
-          while (node && node.nodeType !== 1) {
-            node = node.nextSibling;
-          }
-          return node.childNodes;
-        } else {
-          return nodes;
-        }
-      }
-    };
-
-    __exports__["default"] = DOMHelper;
+    return Metamorph;
   });
-enifed("morph/dom-helper/build-html-dom",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    var svgHTMLIntegrationPoints = {foreignObject: 1, desc: 1, title: 1};
-    __exports__.svgHTMLIntegrationPoints = svgHTMLIntegrationPoints;var svgNamespace = 'http://www.w3.org/2000/svg';
-    __exports__.svgNamespace = svgNamespace;
-    // Safari does not like using innerHTML on SVG HTML integration
-    // points (desc/title/foreignObject).
-    var needsIntegrationPointFix = document && document.createElementNS && (function() {
-      // In FF title will not accept innerHTML.
-      var testEl = document.createElementNS(svgNamespace, 'title');
-      testEl.innerHTML = "<div></div>";
-      return testEl.childNodes.length === 0 || testEl.childNodes[0].nodeType !== 1;
-    })();
 
-    // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
-    // is a "zero-scope" element. This problem can be worked around by making
-    // the first node an invisible text node. We, like Modernizr, use &shy;
-    var needsShy = document && (function() {
-      var testEl = document.createElement('div');
-      testEl.innerHTML = "<div></div>";
-      testEl.firstChild.innerHTML = "<script><\/script>";
-      return testEl.firstChild.innerHTML === '';
-    })();
-
-    // IE 8 (and likely earlier) likes to move whitespace preceeding
-    // a script tag to appear after it. This means that we can
-    // accidentally remove whitespace when updating a morph.
-    var movesWhitespace = document && (function() {
-      var testEl = document.createElement('div');
-      testEl.innerHTML = "Test: <script type='text/x-placeholder'><\/script>Value";
-      return testEl.childNodes[0].nodeValue === 'Test:' &&
-              testEl.childNodes[2].nodeValue === ' Value';
-    })();
-
-    // IE8 create a selected attribute where they should only
-    // create a property
-    var createsSelectedAttribute = document && (function() {
-      var testEl = document.createElement('div');
-      testEl.innerHTML = "<select><option></option></select>";
-      return testEl.childNodes[0].childNodes[0].getAttribute('selected') === 'selected';
-    })();
-
-    var detectAutoSelectedOption;
-    if (createsSelectedAttribute) {
-      var detectAutoSelectedOptionRegex = /<option[^>]*selected/;
-      detectAutoSelectedOption = function detectAutoSelectedOption(select, option, html) { //jshint ignore:line
-        return select.selectedIndex === 0 &&
-               !detectAutoSelectedOptionRegex.test(html);
-      };
-    } else {
-      detectAutoSelectedOption = function detectAutoSelectedOption(select, option, html) { //jshint ignore:line
-        var selectedAttribute = option.getAttribute('selected');
-        return select.selectedIndex === 0 && (
-                 selectedAttribute === null ||
-                 ( selectedAttribute !== '' && selectedAttribute.toLowerCase() !== 'selected' )
-                );
-      };
-    }
-
-    // IE 9 and earlier don't allow us to set innerHTML on col, colgroup, frameset,
-    // html, style, table, tbody, tfoot, thead, title, tr. Detect this and add
-    // them to an initial list of corrected tags.
-    //
-    // Here we are only dealing with the ones which can have child nodes.
-    //
-    var tagNamesRequiringInnerHTMLFix, tableNeedsInnerHTMLFix;
-    var tableInnerHTMLTestElement = document.createElement('table');
-    try {
-      tableInnerHTMLTestElement.innerHTML = '<tbody></tbody>';
-    } catch (e) {
-    } finally {
-      tableNeedsInnerHTMLFix = (tableInnerHTMLTestElement.childNodes.length === 0);
-    }
-    if (tableNeedsInnerHTMLFix) {
-      tagNamesRequiringInnerHTMLFix = {
-        colgroup: ['table'],
-        table: [],
-        tbody: ['table'],
-        tfoot: ['table'],
-        thead: ['table'],
-        tr: ['table', 'tbody']
-      };
-    }
-
-    // IE 8 doesn't allow setting innerHTML on a select tag. Detect this and
-    // add it to the list of corrected tags.
-    //
-    var selectInnerHTMLTestElement = document.createElement('select');
-    selectInnerHTMLTestElement.innerHTML = '<option></option>';
-    if (selectInnerHTMLTestElement) {
-      tagNamesRequiringInnerHTMLFix = tagNamesRequiringInnerHTMLFix || {};
-      tagNamesRequiringInnerHTMLFix.select = [];
-    }
-
-    function scriptSafeInnerHTML(element, html) {
-      // without a leading text node, IE will drop a leading script tag.
-      html = '&shy;'+html;
-
-      element.innerHTML = html;
-
-      var nodes = element.childNodes;
-
-      // Look for &shy; to remove it.
-      var shyElement = nodes[0];
-      while (shyElement.nodeType === 1 && !shyElement.nodeName) {
-        shyElement = shyElement.firstChild;
-      }
-      // At this point it's the actual unicode character.
-      if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
-        var newValue = shyElement.nodeValue.slice(1);
-        if (newValue.length) {
-          shyElement.nodeValue = shyElement.nodeValue.slice(1);
-        } else {
-          shyElement.parentNode.removeChild(shyElement);
-        }
-      }
-
-      return nodes;
-    }
-
-    function buildDOMWithFix(html, contextualElement){
-      var tagName = contextualElement.tagName;
-
-      // Firefox versions < 11 do not have support for element.outerHTML.
-      var outerHTML = contextualElement.outerHTML || new XMLSerializer().serializeToString(contextualElement);
-      if (!outerHTML) {
-        throw "Can't set innerHTML on "+tagName+" in this browser";
-      }
-
-      var wrappingTags = tagNamesRequiringInnerHTMLFix[tagName.toLowerCase()];
-      var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0];
-      var endTag = '</'+tagName+'>';
-
-      var wrappedHTML = [startTag, html, endTag];
-
-      var i = wrappingTags.length;
-      var wrappedDepth = 1 + i;
-      while(i--) {
-        wrappedHTML.unshift('<'+wrappingTags[i]+'>');
-        wrappedHTML.push('</'+wrappingTags[i]+'>');
-      }
-
-      var wrapper = document.createElement('div');
-      scriptSafeInnerHTML(wrapper, wrappedHTML.join(''));
-      var element = wrapper;
-      while (wrappedDepth--) {
-        element = element.firstChild;
-        while (element && element.nodeType !== 1) {
-          element = element.nextSibling;
-        }
-      }
-      while (element && element.tagName !== tagName) {
-        element = element.nextSibling;
-      }
-      return element ? element.childNodes : [];
-    }
-
-    var buildDOM;
-    if (needsShy) {
-      buildDOM = function buildDOM(html, contextualElement, dom){
-        contextualElement = dom.cloneNode(contextualElement, false);
-        scriptSafeInnerHTML(contextualElement, html);
-        return contextualElement.childNodes;
-      };
-    } else {
-      buildDOM = function buildDOM(html, contextualElement, dom){
-        contextualElement = dom.cloneNode(contextualElement, false);
-        contextualElement.innerHTML = html;
-        return contextualElement.childNodes;
-      };
-    }
-
-    var buildIESafeDOM;
-    if (tagNamesRequiringInnerHTMLFix || movesWhitespace) {
-      buildIESafeDOM = function buildIESafeDOM(html, contextualElement, dom) {
-        // Make a list of the leading text on script nodes. Include
-        // script tags without any whitespace for easier processing later.
-        var spacesBefore = [];
-        var spacesAfter = [];
-        html = html.replace(/(\s*)(<script)/g, function(match, spaces, tag) {
-          spacesBefore.push(spaces);
-          return tag;
-        });
-
-        html = html.replace(/(<\/script>)(\s*)/g, function(match, tag, spaces) {
-          spacesAfter.push(spaces);
-          return tag;
-        });
-
-        // Fetch nodes
-        var nodes;
-        if (tagNamesRequiringInnerHTMLFix[contextualElement.tagName.toLowerCase()]) {
-          // buildDOMWithFix uses string wrappers for problematic innerHTML.
-          nodes = buildDOMWithFix(html, contextualElement);
-        } else {
-          nodes = buildDOM(html, contextualElement, dom);
-        }
-
-        // Build a list of script tags, the nodes themselves will be
-        // mutated as we add test nodes.
-        var i, j, node, nodeScriptNodes;
-        var scriptNodes = [];
-        for (i=0;node=nodes[i];i++) {
-          if (node.nodeType !== 1) {
-            continue;
-          }
-          if (node.tagName === 'SCRIPT') {
-            scriptNodes.push(node);
-          } else {
-            nodeScriptNodes = node.getElementsByTagName('script');
-            for (j=0;j<nodeScriptNodes.length;j++) {
-              scriptNodes.push(nodeScriptNodes[j]);
-            }
-          }
-        }
-
-        // Walk the script tags and put back their leading text nodes.
-        var scriptNode, textNode, spaceBefore, spaceAfter;
-        for (i=0;scriptNode=scriptNodes[i];i++) {
-          spaceBefore = spacesBefore[i];
-          if (spaceBefore && spaceBefore.length > 0) {
-            textNode = dom.document.createTextNode(spaceBefore);
-            scriptNode.parentNode.insertBefore(textNode, scriptNode);
-          }
-
-          spaceAfter = spacesAfter[i];
-          if (spaceAfter && spaceAfter.length > 0) {
-            textNode = dom.document.createTextNode(spaceAfter);
-            scriptNode.parentNode.insertBefore(textNode, scriptNode.nextSibling);
-          }
-        }
-
-        return nodes;
-      };
-    } else {
-      buildIESafeDOM = buildDOM;
-    }
-
-    // When parsing innerHTML, the browser may set up DOM with some things
-    // not desired. For example, with a select element context and option
-    // innerHTML the first option will be marked selected.
-    //
-    // This method cleans up some of that, resetting those values back to
-    // their defaults.
-    //
-    function buildSafeDOM(html, contextualElement, dom) {
-      var childNodes = buildIESafeDOM(html, contextualElement, dom);
-
-      if (contextualElement.tagName === 'SELECT') {
-        // Walk child nodes
-        for (var i = 0; childNodes[i]; i++) {
-          // Find and process the first option child node
-          if (childNodes[i].tagName === 'OPTION') {
-            if (detectAutoSelectedOption(childNodes[i].parentNode, childNodes[i], html)) {
-              // If the first node is selected but does not have an attribute,
-              // presume it is not really selected.
-              childNodes[i].parentNode.selectedIndex = -1;
-            }
-            break;
-          }
-        }
-      }
-
-      return childNodes;
-    }
-
-    var buildHTMLDOM;
-    if (needsIntegrationPointFix) {
-      buildHTMLDOM = function buildHTMLDOM(html, contextualElement, dom){
-        if (svgHTMLIntegrationPoints[contextualElement.tagName]) {
-          return buildSafeDOM(html, document.createElement('div'), dom);
-        } else {
-          return buildSafeDOM(html, contextualElement, dom);
-        }
-      };
-    } else {
-      buildHTMLDOM = buildSafeDOM;
-    }
-
-    __exports__.buildHTMLDOM = buildHTMLDOM;
-  });
-enifed("morph/morph",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    var splice = Array.prototype.splice;
-
-    function ensureStartEnd(start, end) {
-      if (start === null || end === null) {
-        throw new Error('a fragment parent must have boundary nodes in order to detect insertion');
-      }
-    }
-
-    function ensureContext(contextualElement) {
-      if (!contextualElement || contextualElement.nodeType !== 1) {
-        throw new Error('An element node must be provided for a contextualElement, you provided ' +
-                        (contextualElement ? 'nodeType ' + contextualElement.nodeType : 'nothing'));
-      }
-    }
-
-    // TODO: this is an internal API, this should be an assert
-    function Morph(parent, start, end, domHelper, contextualElement) {
-      if (parent.nodeType === 11) {
-        ensureStartEnd(start, end);
-        this.element = null;
-      } else {
-        this.element = parent;
-      }
-      this._parent = parent;
-      this.start = start;
-      this.end = end;
-      this.domHelper = domHelper;
-      ensureContext(contextualElement);
-      this.contextualElement = contextualElement;
-      this.reset();
-    }
-
-    Morph.prototype.reset = function() {
-      this.text = null;
-      this.owner = null;
-      this.morphs = null;
-      this.before = null;
-      this.after = null;
-      this.escaped = true;
-    };
-
-    Morph.prototype.parent = function () {
-      if (!this.element) {
-        var parent = this.start.parentNode;
-        if (this._parent !== parent) {
-          this.element = this._parent = parent;
-        }
-      }
-      return this._parent;
-    };
-
-    Morph.prototype.destroy = function () {
-      if (this.owner) {
-        this.owner.removeMorph(this);
-      } else {
-        clear(this.element || this.parent(), this.start, this.end);
-      }
-    };
-
-    Morph.prototype.removeMorph = function (morph) {
-      var morphs = this.morphs;
-      for (var i=0, l=morphs.length; i<l; i++) {
-        if (morphs[i] === morph) {
-          this.replace(i, 1);
-          break;
-        }
-      }
-    };
-
-    Morph.prototype.update = function (nodeOrString) {
-      this._update(this.element || this.parent(), nodeOrString);
-    };
-
-    Morph.prototype.updateNode = function (node) {
-      var parent = this.element || this.parent();
-      if (!node) return this._updateText(parent, '');
-      this._updateNode(parent, node);
-    };
-
-    Morph.prototype.updateText = function (text) {
-      this._updateText(this.element || this.parent(), text);
-    };
-
-    Morph.prototype.updateHTML = function (html) {
-      var parent = this.element || this.parent();
-      if (!html) return this._updateText(parent, '');
-      this._updateHTML(parent, html);
-    };
-
-    Morph.prototype._update = function (parent, nodeOrString) {
-      if (nodeOrString === null || nodeOrString === undefined) {
-        this._updateText(parent, '');
-      } else if (typeof nodeOrString === 'string') {
-        if (this.escaped) {
-          this._updateText(parent, nodeOrString);
-        } else {
-          this._updateHTML(parent, nodeOrString);
-        }
-      } else if (nodeOrString.nodeType) {
-        this._updateNode(parent, nodeOrString);
-      } else if (nodeOrString.string) { // duck typed SafeString
-        this._updateHTML(parent, nodeOrString.string);
-      } else {
-        this._updateText(parent, nodeOrString.toString());
-      }
-    };
-
-    Morph.prototype._updateNode = function (parent, node) {
-      if (this.text) {
-        if (node.nodeType === 3) {
-          this.text.nodeValue = node.nodeValue;
-          return;
-        } else {
-          this.text = null;
-        }
-      }
-      var start = this.start, end = this.end;
-      clear(parent, start, end);
-      parent.insertBefore(node, end);
-      if (this.before !== null) {
-        this.before.end = start.nextSibling;
-      }
-      if (this.after !== null) {
-        this.after.start = end.previousSibling;
-      }
-    };
-
-    Morph.prototype._updateText = function (parent, text) {
-      if (this.text) {
-        this.text.nodeValue = text;
-        return;
-      }
-      var node = this.domHelper.createTextNode(text);
-      this.text = node;
-      clear(parent, this.start, this.end);
-      parent.insertBefore(node, this.end);
-      if (this.before !== null) {
-        this.before.end = node;
-      }
-      if (this.after !== null) {
-        this.after.start = node;
-      }
-    };
-
-    Morph.prototype._updateHTML = function (parent, html) {
-      var start = this.start, end = this.end;
-      clear(parent, start, end);
-      this.text = null;
-      var childNodes = this.domHelper.parseHTML(html, this.contextualElement);
-      appendChildren(parent, end, childNodes);
-      if (this.before !== null) {
-        this.before.end = start.nextSibling;
-      }
-      if (this.after !== null) {
-        this.after.start = end.previousSibling;
-      }
-    };
-
-    Morph.prototype.append = function (node) {
-      if (this.morphs === null) this.morphs = [];
-      var index = this.morphs.length;
-      return this.insert(index, node);
-    };
-
-    Morph.prototype.insert = function (index, node) {
-      if (this.morphs === null) this.morphs = [];
-      var parent = this.element || this.parent();
-      var morphs = this.morphs;
-      var before = index > 0 ? morphs[index-1] : null;
-      var after  = index < morphs.length ? morphs[index] : null;
-      var start  = before === null ? this.start : (before.end === null ? parent.lastChild : before.end.previousSibling);
-      var end    = after === null ? this.end : (after.start === null ? parent.firstChild : after.start.nextSibling);
-      var morph  = new Morph(parent, start, end, this.domHelper, this.contextualElement);
-
-      morph.owner = this;
-      morph._update(parent, node);
-
-      if (before !== null) {
-        morph.before = before;
-        before.end = start.nextSibling;
-        before.after = morph;
-      }
-
-      if (after !== null) {
-        morph.after = after;
-        after.before = morph;
-        after.start = end.previousSibling;
-      }
-
-      this.morphs.splice(index, 0, morph);
-      return morph;
-    };
-
-    Morph.prototype.replace = function (index, removedLength, addedNodes) {
-      if (this.morphs === null) this.morphs = [];
-      var parent = this.element || this.parent();
-      var morphs = this.morphs;
-      var before = index > 0 ? morphs[index-1] : null;
-      var after = index+removedLength < morphs.length ? morphs[index+removedLength] : null;
-      var start = before === null ? this.start : (before.end === null ? parent.lastChild : before.end.previousSibling);
-      var end   = after === null ? this.end : (after.start === null ? parent.firstChild : after.start.nextSibling);
-      var addedLength = addedNodes === undefined ? 0 : addedNodes.length;
-      var args, i, current;
-
-      if (removedLength > 0) {
-        clear(parent, start, end);
-      }
-
-      if (addedLength === 0) {
-        if (before !== null) {
-          before.after = after;
-          before.end = end;
-        }
-        if (after !== null) {
-          after.before = before;
-          after.start = start;
-        }
-        morphs.splice(index, removedLength);
-        return;
-      }
-
-      args = new Array(addedLength+2);
-      if (addedLength > 0) {
-        for (i=0; i<addedLength; i++) {
-          args[i+2] = current = new Morph(parent, start, end, this.domHelper, this.contextualElement);
-          current._update(parent, addedNodes[i]);
-          current.owner = this;
-          if (before !== null) {
-            current.before = before;
-            before.end = start.nextSibling;
-            before.after = current;
-          }
-          before = current;
-          start = end === null ? parent.lastChild : end.previousSibling;
-        }
-        if (after !== null) {
-          current.after = after;
-          after.before = current;
-          after.start = end.previousSibling;
-        }
-      }
-
-      args[0] = index;
-      args[1] = removedLength;
-
-      splice.apply(morphs, args);
-    };
-
-    function appendChildren(parent, end, nodeList) {
-      var ref = end;
-      var i = nodeList.length;
-      var node;
-
-      while (i--) {
-        node = nodeList[i];
-        parent.insertBefore(node, ref);
-        ref = node;
-      }
-    }
-
-    function clear(parent, start, end) {
-      var current, previous;
-      if (end === null) {
-        current = parent.lastChild;
-      } else {
-        current = end.previousSibling;
-      }
-
-      while (current !== null && current !== start) {
-        previous = current.previousSibling;
-        parent.removeChild(current);
-        current = previous;
-      }
-    }
-
-    __exports__["default"] = Morph;
-  });
-enifed("route-recognizer",
+define("route-recognizer",
   ["route-recognizer/dsl","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -44797,7 +43342,7 @@ enifed("route-recognizer",
 
     __exports__["default"] = RouteRecognizer;
   });
-enifed("route-recognizer/dsl",
+define("route-recognizer/dsl",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -44901,15 +43446,8 @@ enifed("route-recognizer/dsl",
       }, this);
     }
   });
-enifed("router",
-  ["./router/router","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var Router = __dependency1__["default"];
 
-    __exports__["default"] = Router;
-  });
-enifed("router/handler-info",
+define("router/handler-info",
   ["./utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -45086,7 +43624,7 @@ enifed("router/handler-info",
 
     __exports__["default"] = HandlerInfo;
   });
-enifed("router/handler-info/factory",
+define("router/handler-info/factory",
   ["router/handler-info/resolved-handler-info","router/handler-info/unresolved-handler-info-by-object","router/handler-info/unresolved-handler-info-by-param","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -45109,7 +43647,7 @@ enifed("router/handler-info/factory",
 
     __exports__["default"] = handlerInfoFactory;
   });
-enifed("router/handler-info/resolved-handler-info",
+define("router/handler-info/resolved-handler-info",
   ["../handler-info","router/utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -45140,7 +43678,7 @@ enifed("router/handler-info/resolved-handler-info",
 
     __exports__["default"] = ResolvedHandlerInfo;
   });
-enifed("router/handler-info/unresolved-handler-info-by-object",
+define("router/handler-info/unresolved-handler-info-by-object",
   ["../handler-info","router/utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -45202,7 +43740,7 @@ enifed("router/handler-info/unresolved-handler-info-by-object",
 
     __exports__["default"] = UnresolvedHandlerInfoByObject;
   });
-enifed("router/handler-info/unresolved-handler-info-by-param",
+define("router/handler-info/unresolved-handler-info-by-param",
   ["../handler-info","router/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -45236,7 +43774,7 @@ enifed("router/handler-info/unresolved-handler-info-by-param",
 
     __exports__["default"] = UnresolvedHandlerInfoByParam;
   });
-enifed("router/router",
+define("router/router",
   ["route-recognizer","rsvp/promise","./utils","./transition-state","./transition","./transition-intent/named-transition-intent","./transition-intent/url-transition-intent","./handler-info","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -45267,58 +43805,6 @@ enifed("router/router",
       this.reset();
     }
 
-    function getTransitionByIntent(intent, isIntermediate) {
-      var wasTransitioning = !!this.activeTransition;
-      var oldState = wasTransitioning ? this.activeTransition.state : this.state;
-      var newTransition;
-
-      var newState = intent.applyToState(oldState, this.recognizer, this.getHandler, isIntermediate);
-      var queryParamChangelist = getChangelist(oldState.queryParams, newState.queryParams);
-
-      if (handlerInfosEqual(newState.handlerInfos, oldState.handlerInfos)) {
-
-        // This is a no-op transition. See if query params changed.
-        if (queryParamChangelist) {
-          newTransition = this.queryParamsTransition(queryParamChangelist, wasTransitioning, oldState, newState);
-          if (newTransition) {
-            return newTransition;
-          }
-        }
-
-        // No-op. No need to create a new transition.
-        return new Transition(this);
-      }
-
-      if (isIntermediate) {
-        setupContexts(this, newState);
-        return;
-      }
-
-      // Create a new transition to the destination route.
-      newTransition = new Transition(this, intent, newState);
-
-      // Abort and usurp any previously active transition.
-      if (this.activeTransition) {
-        this.activeTransition.abort();
-      }
-      this.activeTransition = newTransition;
-
-      // Transition promises by default resolve with resolved state.
-      // For our purposes, swap out the promise to resolve
-      // after the transition has been finalized.
-      newTransition.promise = newTransition.promise.then(function(result) {
-        return finalizeTransition(newTransition, result.state);
-      }, null, promiseLabel("Settle transition promise when transition is finalized"));
-
-      if (!wasTransitioning) {
-        notifyExistingHandlers(this, newState, newTransition);
-      }
-
-      fireQueryParamDidChange(this, newState, queryParamChangelist);
-
-      return newTransition;
-    }
-
     Router.prototype = {
 
       /**
@@ -45383,8 +43869,58 @@ enifed("router/router",
       // it shall remain until our ES6 transpiler can
       // handle cyclical deps.
       transitionByIntent: function(intent, isIntermediate) {
+
+        var wasTransitioning = !!this.activeTransition;
+        var oldState = wasTransitioning ? this.activeTransition.state : this.state;
+        var newTransition;
+        var router = this;
+
         try {
-          return getTransitionByIntent.apply(this, arguments);
+          var newState = intent.applyToState(oldState, this.recognizer, this.getHandler, isIntermediate);
+          var queryParamChangelist = getChangelist(oldState.queryParams, newState.queryParams);
+
+          if (handlerInfosEqual(newState.handlerInfos, oldState.handlerInfos)) {
+
+            // This is a no-op transition. See if query params changed.
+            if (queryParamChangelist) {
+              newTransition = this.queryParamsTransition(queryParamChangelist, wasTransitioning, oldState, newState);
+              if (newTransition) {
+                return newTransition;
+              }
+            }
+
+            // No-op. No need to create a new transition.
+            return new Transition(this);
+          }
+
+          if (isIntermediate) {
+            setupContexts(this, newState);
+            return;
+          }
+
+          // Create a new transition to the destination route.
+          newTransition = new Transition(this, intent, newState);
+
+          // Abort and usurp any previously active transition.
+          if (this.activeTransition) {
+            this.activeTransition.abort();
+          }
+          this.activeTransition = newTransition;
+
+          // Transition promises by default resolve with resolved state.
+          // For our purposes, swap out the promise to resolve
+          // after the transition has been finalized.
+          newTransition.promise = newTransition.promise.then(function(result) {
+            return finalizeTransition(newTransition, result.state);
+          }, null, promiseLabel("Settle transition promise when transition is finalized"));
+
+          if (!wasTransitioning) {
+            notifyExistingHandlers(this, newState, newTransition);
+          }
+
+          fireQueryParamDidChange(this, newState, queryParamChangelist);
+
+          return newTransition;
         } catch(e) {
           return new Transition(this, intent, null, e);
         }
@@ -45726,9 +44262,7 @@ enifed("router/router",
       var handler = handlerInfo.handler,
           context = handlerInfo.context;
 
-      if (enter) {
-        callHook(handler, 'enter', transition);
-      }
+      callHook(handler, 'enter', transition);
       if (transition && transition.isAborted) {
         throw new TransitionAborted();
       }
@@ -46057,7 +44591,7 @@ enifed("router/router",
 
     __exports__["default"] = Router;
   });
-enifed("router/transition-intent",
+define("router/transition-intent",
   ["./utils","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -46077,7 +44611,7 @@ enifed("router/transition-intent",
 
     __exports__["default"] = TransitionIntent;
   });
-enifed("router/transition-intent/named-transition-intent",
+define("router/transition-intent/named-transition-intent",
   ["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -46278,7 +44812,7 @@ enifed("router/transition-intent/named-transition-intent",
       }
     });
   });
-enifed("router/transition-intent/url-transition-intent",
+define("router/transition-intent/url-transition-intent",
   ["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -46348,7 +44882,7 @@ enifed("router/transition-intent/url-transition-intent",
       this.name = "UnrecognizedURLError";
     }
   });
-enifed("router/transition-state",
+define("router/transition-state",
   ["./handler-info","./utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -46464,7 +44998,7 @@ enifed("router/transition-state",
 
     __exports__["default"] = TransitionState;
   });
-enifed("router/transition",
+define("router/transition",
   ["rsvp/promise","./handler-info","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -46775,7 +45309,7 @@ enifed("router/transition",
     __exports__.logAbort = logAbort;
     __exports__.TransitionAborted = TransitionAborted;
   });
-enifed("router/utils",
+define("router/utils",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -46994,7 +45528,16 @@ enifed("router/utils",
     __exports__.resolveHook = resolveHook;
     __exports__.applyHook = applyHook;
   });
-enifed("rsvp",
+define("router",
+  ["./router/router","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Router = __dependency1__["default"];
+
+    __exports__["default"] = Router;
+  });
+
+define("rsvp",
   ["./rsvp/promise","./rsvp/events","./rsvp/node","./rsvp/all","./rsvp/all-settled","./rsvp/race","./rsvp/hash","./rsvp/hash-settled","./rsvp/rethrow","./rsvp/defer","./rsvp/config","./rsvp/map","./rsvp/resolve","./rsvp/reject","./rsvp/filter","./rsvp/asap","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
     "use strict";
@@ -47061,7 +45604,7 @@ enifed("rsvp",
     __exports__.map = map;
     __exports__.filter = filter;
   });
-enifed("rsvp.umd",
+define("rsvp.umd",
   ["./rsvp"],
   function(__dependency1__) {
     "use strict";
@@ -47106,15 +45649,15 @@ enifed("rsvp.umd",
     };
 
     /* global define:true module:true window: true */
-    if (typeof enifed === 'function' && enifed['amd']) {
-      enifed(function() { return RSVP; });
-    } else if (typeof module !== 'undefined' && module['exports']) {
-      module['exports'] = RSVP;
+    if (typeof define === 'function' && define.amd) {
+      define(function() { return RSVP; });
+    } else if (typeof module !== 'undefined' && module.exports) {
+      module.exports = RSVP;
     } else if (typeof this !== 'undefined') {
       this['RSVP'] = RSVP;
     }
   });
-enifed("rsvp/-internal",
+define("rsvp/-internal",
   ["./utils","./instrument","./config","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -47125,10 +45668,6 @@ enifed("rsvp/-internal",
 
     var config = __dependency3__.config;
 
-    function  withOwnPromise() {
-      return new TypeError('A promises callback cannot return that same promise.');
-    }
-
     function noop() {}
 
     var PENDING   = void 0;
@@ -47328,7 +45867,7 @@ enifed("rsvp/-internal",
         }
 
         if (promise === value) {
-          reject(promise, withOwnPromise());
+          reject(promise, new TypeError('A promises callback cannot return that same promise.'));
           return;
         }
 
@@ -47375,7 +45914,7 @@ enifed("rsvp/-internal",
     __exports__.REJECTED = REJECTED;
     __exports__.PENDING = PENDING;
   });
-enifed("rsvp/all-settled",
+define("rsvp/all-settled",
   ["./enumerator","./promise","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -47451,7 +45990,7 @@ enifed("rsvp/all-settled",
       return new AllSettled(Promise, entries, label).promise;
     }
   });
-enifed("rsvp/all",
+define("rsvp/all",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -47471,7 +46010,7 @@ enifed("rsvp/all",
       return Promise.all(array, label);
     }
   });
-enifed("rsvp/asap",
+define("rsvp/asap",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -47489,8 +46028,7 @@ enifed("rsvp/asap",
       }
     }
 
-    var browserWindow = (typeof window !== 'undefined') ? window : undefined
-    var browserGlobal = browserWindow || {};
+    var browserGlobal = (typeof window !== 'undefined') ? window : {};
     var BrowserMutationObserver = browserGlobal.MutationObserver || browserGlobal.WebKitMutationObserver;
 
     // test for web worker but not in IE10
@@ -47505,13 +46043,6 @@ enifed("rsvp/asap",
       };
     }
 
-    // vertx
-    function useVertxTimer() {
-      return function() {
-        vertxNext(flush);
-      };
-    }
-
     function useMutationObserver() {
       var iterations = 0;
       var observer = new BrowserMutationObserver(flush);
@@ -47553,17 +46084,8 @@ enifed("rsvp/asap",
       len = 0;
     }
 
-    function attemptVertex() {
-      try {
-        var vertx = eriuqer('vertx');
-        var vertxNext = vertx.runOnLoop || vertx.runOnContext;
-        return useVertxTimer();
-      } catch(e) {
-        return useSetTimeout();
-      }
-    }
-
     var scheduleFlush;
+
     // Decide what async method to use to triggering processing of queued callbacks:
     if (typeof process !== 'undefined' && {}.toString.call(process) === '[object process]') {
       scheduleFlush = useNextTick();
@@ -47571,13 +46093,11 @@ enifed("rsvp/asap",
       scheduleFlush = useMutationObserver();
     } else if (isWorker) {
       scheduleFlush = useMessageChannel();
-    } else if (browserWindow === undefined && typeof eriuqer === 'function') {
-      scheduleFlush = attemptVertex();
     } else {
       scheduleFlush = useSetTimeout();
     }
   });
-enifed("rsvp/config",
+define("rsvp/config",
   ["./events","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -47608,7 +46128,7 @@ enifed("rsvp/config",
     __exports__.config = config;
     __exports__.configure = configure;
   });
-enifed("rsvp/defer",
+define("rsvp/defer",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -47650,15 +46170,15 @@ enifed("rsvp/defer",
     __exports__["default"] = function defer(label) {
       var deferred = { };
 
-      deferred['promise'] = new Promise(function(resolve, reject) {
-        deferred['resolve'] = resolve;
-        deferred['reject'] = reject;
+      deferred.promise = new Promise(function(resolve, reject) {
+        deferred.resolve = resolve;
+        deferred.reject = reject;
       }, label);
 
       return deferred;
     }
   });
-enifed("rsvp/enumerator",
+define("rsvp/enumerator",
   ["./utils","./-internal","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -47784,7 +46304,7 @@ enifed("rsvp/enumerator",
       });
     };
   });
-enifed("rsvp/events",
+define("rsvp/events",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -47990,7 +46510,7 @@ enifed("rsvp/events",
       }
     };
   });
-enifed("rsvp/filter",
+define("rsvp/filter",
   ["./promise","./utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -48113,7 +46633,7 @@ enifed("rsvp/filter",
       });
     }
   });
-enifed("rsvp/hash-settled",
+define("rsvp/hash-settled",
   ["./promise","./enumerator","./promise-hash","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -48240,7 +46760,7 @@ enifed("rsvp/hash-settled",
       return new HashSettled(Promise, object, label).promise;
     }
   });
-enifed("rsvp/hash",
+define("rsvp/hash",
   ["./promise","./promise-hash","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -48339,7 +46859,7 @@ enifed("rsvp/hash",
       return new PromiseHash(Promise, object, label).promise;
     }
   });
-enifed("rsvp/instrument",
+define("rsvp/instrument",
   ["./config","./utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -48348,44 +46868,31 @@ enifed("rsvp/instrument",
 
     var queue = [];
 
-    function scheduleFlush() {
-      setTimeout(function() {
-        var entry;
-        for (var i = 0; i < queue.length; i++) {
-          entry = queue[i];
-
-          var payload = entry.payload;
-
-          payload.guid = payload.key + payload.id;
-          payload.childGuid = payload.key + payload.childId;
-          if (payload.error) {
-            payload.stack = payload.error.stack;
-          }
-
-          config.trigger(entry.name, entry.payload);
-        }
-        queue.length = 0;
-      }, 50);
-    }
-
     __exports__["default"] = function instrument(eventName, promise, child) {
       if (1 === queue.push({
           name: eventName,
           payload: {
-            key: promise._guidKey,
-            id:  promise._id,
+            guid: promise._guidKey + promise._id,
             eventName: eventName,
             detail: promise._result,
-            childId: child && child._id,
+            childGuid: child && promise._guidKey + child._id,
             label: promise._label,
             timeStamp: now(),
-            error: config["instrument-with-stack"] ? new Error(promise._label) : null
+            stack: new Error(promise._label).stack
           }})) {
-            scheduleFlush();
+
+            setTimeout(function() {
+              var entry;
+              for (var i = 0; i < queue.length; i++) {
+                entry = queue[i];
+                config.trigger(entry.name, entry.payload);
+              }
+              queue.length = 0;
+            }, 50);
           }
       }
   });
-enifed("rsvp/map",
+define("rsvp/map",
   ["./promise","./utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -48487,7 +46994,7 @@ enifed("rsvp/map",
       });
     }
   });
-enifed("rsvp/node",
+define("rsvp/node",
   ["./promise","./-internal","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -48771,7 +47278,7 @@ enifed("rsvp/node",
       }
     }
   });
-enifed("rsvp/promise-hash",
+define("rsvp/promise-hash",
   ["./enumerator","./-internal","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -48823,7 +47330,7 @@ enifed("rsvp/promise-hash",
       }
     };
   });
-enifed("rsvp/promise",
+define("rsvp/promise",
   ["./config","./instrument","./utils","./-internal","./promise/all","./promise/race","./promise/resolve","./promise/reject","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -49312,7 +47819,7 @@ enifed("rsvp/promise",
       }
     };
   });
-enifed("rsvp/promise/all",
+define("rsvp/promise/all",
   ["../enumerator","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -49369,7 +47876,7 @@ enifed("rsvp/promise/all",
       return new Enumerator(this, entries, true /* abort on reject */, label).promise;
     }
   });
-enifed("rsvp/promise/race",
+define("rsvp/promise/race",
   ["../utils","../-internal","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -49475,7 +47982,7 @@ enifed("rsvp/promise/race",
       return promise;
     }
   });
-enifed("rsvp/promise/reject",
+define("rsvp/promise/reject",
   ["../-internal","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -49525,7 +48032,7 @@ enifed("rsvp/promise/reject",
       return promise;
     }
   });
-enifed("rsvp/promise/resolve",
+define("rsvp/promise/resolve",
   ["../-internal","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -49577,7 +48084,7 @@ enifed("rsvp/promise/resolve",
       return promise;
     }
   });
-enifed("rsvp/race",
+define("rsvp/race",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -49597,7 +48104,7 @@ enifed("rsvp/race",
       return Promise.race(array, label);
     }
   });
-enifed("rsvp/reject",
+define("rsvp/reject",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -49618,7 +48125,7 @@ enifed("rsvp/reject",
       return Promise.reject(reason, label);
     }
   });
-enifed("rsvp/resolve",
+define("rsvp/resolve",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -49640,7 +48147,7 @@ enifed("rsvp/resolve",
       return Promise.resolve(value, label);
     }
   });
-enifed("rsvp/rethrow",
+define("rsvp/rethrow",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -49691,7 +48198,7 @@ enifed("rsvp/rethrow",
       throw reason;
     }
   });
-enifed("rsvp/utils",
+define("rsvp/utils",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -49738,4 +48245,4 @@ enifed("rsvp/utils",
   });
 requireModule("ember");
 
-})();
+})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/list-view.js b/vendor/assets/javascripts/development/list-view.js
similarity index 91%
rename from vendor/assets/javascripts/list-view.js
rename to vendor/assets/javascripts/development/list-view.js
index 9c1f475791..45400aa4b9 100644
--- a/vendor/assets/javascripts/list-view.js
+++ b/vendor/assets/javascripts/development/list-view.js
@@ -159,6 +159,79 @@ define("list-view/list_item_view",
 
     var get = Ember.get, set = Ember.set;
 
+    function backportedInnerString(buffer) {
+      var content = [], childBuffers = buffer.childBuffers;
+
+      Ember.ArrayPolyfills.forEach.call(childBuffers, function(buffer) {
+        var stringy = typeof buffer === 'string';
+        if (stringy) {
+          content.push(buffer);
+        } else {
+          buffer.array(content);
+        }
+      });
+
+      return content.join('');
+    }
+
+    function willInsertElementIfNeeded(view) {
+      if (view.willInsertElement) {
+        view.willInsertElement();
+      }
+    }
+
+    function didInsertElementIfNeeded(view) {
+      if (view.didInsertElement) {
+        view.didInsertElement();
+      }
+    }
+
+    function rerender() {
+      var element, buffer, context, hasChildViews;
+      element = get(this, 'element');
+
+      if (!element) { return; }
+
+      context = get(this, 'context');
+
+
+      // releases action helpers in contents
+      // this means though that the ListItemView itself can't use classBindings or attributeBindings
+      // need support for rerender contents in ember
+      this.triggerRecursively('willClearRender');
+
+      if (this.lengthAfterRender > this.lengthBeforeRender) {
+        this.clearRenderedChildren();
+        this._childViews.length = this.lengthBeforeRender; // triage bug in ember
+      }
+
+      if (context) {
+        buffer = Ember.RenderBuffer();
+        buffer = this.renderToBuffer(buffer);
+
+        // check again for childViews, since rendering may have added some
+        hasChildViews = this._childViews.length > 0;
+
+        if (hasChildViews) {
+          this.invokeRecursively(willInsertElementIfNeeded, false);
+        }
+
+        element.innerHTML = buffer.innerString ? buffer.innerString() : backportedInnerString(buffer);
+
+        set(this, 'element', element);
+
+        var transitionTo = this._transitionTo ? this._transitionTo : this.transitionTo;
+
+        transitionTo.call(this, 'inDOM');
+
+        if (hasChildViews) {
+          this.invokeRecursively(didInsertElementIfNeeded, false);
+        }
+      } else {
+        element.innerHTML = ''; // when there is no context, this view should be completely empty
+      }
+    }
+
     /**
       The `Ember.ListItemView` view class renders a
       [div](https://developer.mozilla.org/en/HTML/Element/div) HTML element
@@ -188,7 +261,6 @@ define("list-view/list_item_view",
     __exports__["default"] = Ember.View.extend(ListItemViewMixin, {
       updateContext: function(newContext){
         var context = get(this, 'context');
-
         Ember.instrument('view.updateContext.render', this, function() {
           if (context !== newContext) {
             set(this, 'context', newContext);
@@ -198,19 +270,10 @@ define("list-view/list_item_view",
           }
         }, this);
       },
-
       rerender: function () {
-        // todo: work around for tests.  investigate a real fix.
-        if(get(this, 'isDestroying') || get(this, 'isDestroyed')) {
-          return;
-        }
-
-        return this._super.apply(this, arguments);
+        Ember.run.scheduleOnce('render', this, rerender);
       },
-
-      _contextDidChange: Ember.observer(function () {
-        Ember.run.once(this, this.rerender);
-      }, 'context', 'controller')
+      _contextDidChange: Ember.observer(rerender, 'context', 'controller')
     });
   });
 define("list-view/list_item_view_mixin",
@@ -219,7 +282,7 @@ define("list-view/list_item_view_mixin",
     "use strict";
     // jshint validthis: true
 
-    var get = Ember.get;
+    var get = Ember.get, set = Ember.set;
 
     function samePosition(a, b) {
       return a && b && a.x === b.x && a.y === b.y;
@@ -233,41 +296,28 @@ define("list-view/list_item_view_mixin",
         position = this.position;
         _position = this._position;
 
-        if (!position || !element) {
-          return;
-        }
+        if (!position || !element) { return; }
 
-        // // TODO: avoid needing this by avoiding unnecessary
-        // // calls to this method in the first place
-        if (samePosition(position, _position)) {
-          return;
-        }
-
-        Ember.run.schedule('render', this, this._parentView.applyTransform, this, position.x, position.y);
+        // TODO: avoid needing this by avoiding unnecessary
+        // calls to this method in the first place
+        if (samePosition(position, _position)) { return; }
+        Ember.run.schedule('render', this, this._parentView.applyTransform, element, position.x, position.y);
         this._position = position;
       }, this);
     }
 
-    var TransformMixin = Ember.Mixin.create({
-      style: '',
-      attributeBindings: ['style'],
-    });
-    __exports__.TransformMixin = TransformMixin;
-    __exports__["default"] = Ember.Mixin.create(TransformMixin, {
-      _position: null,
-      classNames: ['ember-list-item-view'],
-      _positionElement: positionElement,
-
+    __exports__["default"] = Ember.Mixin.create({
       init: function(){
         this._super();
-
         this.one('didInsertElement', positionElement);
       },
-
+      classNames: ['ember-list-item-view'],
+      _position: null,
       updatePosition: function(position) {
         this.position = position;
         this._positionElement();
-      }
+      },
+      _positionElement: positionElement
     });
   });
 define("list-view/list_view",
@@ -450,45 +500,24 @@ define("list-view/list_view_helper",
     "use strict";
     // TODO - remove this!
     var el = document.createElement('div'), style = el.style;
-    var set = Ember.set;
 
-    function testProp (prop) {
+    var propPrefixes = ['Webkit', 'Moz', 'O', 'ms'];
+
+    function testProp(prop) {
+      if (prop in style) return prop;
       var uppercaseProp = prop.charAt(0).toUpperCase() + prop.slice(1);
-
-      var dic = {
-        webkit: '-webkit-' + prop,
-        moz: '-moz-' + prop,
-        ms: 'ms' + uppercaseProp
-      };
-
-      var props = [
-        prop,
-        'webkit' + prop,
-        'webkit' + uppercaseProp,
-        'Moz' + uppercaseProp,
-        'moz' + uppercaseProp,
-        'ms' + uppercaseProp,
-        'ms' + prop
-      ];
-
-      for (var i=0; i < props.length; i++) {
-        var property = props[i];
-        var prefix;
-
-        if (property in style) {
-          prefix = property.toLowerCase().replace(prop, '');
-          if (prefix && dic[prefix]) {
-            return dic[prefix];
-          }
-          return property;
+      for (var i=0; i<propPrefixes.length; i++) {
+        var prefixedProp = propPrefixes[i] + uppercaseProp;
+        if (prefixedProp in style) {
+          return prefixedProp;
         }
       }
-
       return null;
     }
 
     var transformProp = testProp('transform');
     var perspectiveProp = testProp('perspective');
+
     var supports2D = transformProp !== null;
     var supports3D = perspectiveProp !== null;
 
@@ -496,27 +525,29 @@ define("list-view/list_view_helper",
       transformProp: transformProp,
       applyTransform: (function(){
         if (supports2D) {
-          return function(childView, x, y){
-            set(childView, 'style', transformProp + ': translate(' + x + 'px, ' + y + 'px);');
+          return function(element, x, y){
+            element.style[transformProp] = 'translate(' + x + 'px, ' + y + 'px)';
           };
         } else {
-          return function(childView, x, y){
-            set(childView, 'style', 'top: ' + y + 'px; left: ' + x + 'px;');
+          return function(element, x, y){
+            element.style.top  = y + 'px';
+            element.style.left = x + 'px';
           };
         }
       })(),
       apply3DTransform: (function(){
         if (supports3D) {
-          return function(childView, x, y){
-            set(childView, 'style', transformProp + ': translate3d(' + x + 'px, ' + y + 'px, 0);');
+          return function(element, x, y){
+            element.style[transformProp] = 'translate3d(' + x + 'px, ' + y + 'px, 0)';
           };
         } else if (supports2D) {
-          return function(childView, x, y){
-            set(childView, 'style', transformProp + ': translate(' + x + 'px, ' + y + 'px);');
+          return function(element, x, y){
+            element.style[transformProp] = 'translate(' + x + 'px, ' + y + 'px)';
           };
         } else {
-          return function(childView, x, y){
-            set(childView, 'style', 'top: ' + y + 'px; left: ' + x + 'px;');
+          return function(element, x, y){
+            element.style.top  = y + 'px';
+            element.style.left = x + 'px';
           };
         }
       })()
@@ -593,6 +624,13 @@ define("list-view/list_view_mixin",
       this.unshiftObject(emptyView);
     }
 
+    var domManager = Ember.create(Ember.ContainerView.proto().domManager);
+
+    domManager.prepend = function(view, html) {
+      view.$('.ember-list-container').prepend(html);
+      notifyMutationListeners();
+    };
+
     function enableProfilingOutput() {
       function before(name, time, payload) {
         console.time(name);
@@ -624,6 +662,7 @@ define("list-view/list_view_mixin",
       classNames: ['ember-list-view'],
       attributeBindings: ['style'],
       classNameBindings: ['_isGrid:ember-list-view-grid:ember-list-view-list'],
+      domManager: domManager,
       scrollTop: 0,
       bottomPadding: 0, // TODO: maybe this can go away
       _lastEndingIndex: 0,
@@ -667,15 +706,9 @@ define("list-view/list_view_mixin",
         @param {Ember.RenderBuffer} buffer The render buffer
       */
       render: function(buffer) {
-        buffer.push('<div class="ember-list-container"></div>');
+        buffer.push('<div class="ember-list-container">');
         this._super(buffer);
-      },
-
-      createChildViewsMorph: function (element) {
-        var children = element.children;
-        element = children[0];
-        this._childViewsMorph = this._renderer._dom.createMorph(element, children[children.length - 1], null);
-        return element;
+        buffer.push('</div>');
       },
 
       willInsertElement: function() {
@@ -1402,9 +1435,7 @@ define("list-view/list_view_mixin",
       },
 
       destroy: function () {
-        if (!this._super()) {
-          return;
-        }
+        if (!this._super()) { return; }
 
         if (this._createdEmptyView) {
           this._createdEmptyView.destroy();
@@ -1517,9 +1548,7 @@ define("list-view/virtual_list_scroller_events",
     } else {
       startEvent = 'mousedown';
       handleStart = function (e) {
-        if (e.which !== 1) {
-          return;
-        }
+        if (e.which !== 1) return;
         var target = e.target;
         // avoid e.preventDefault() on fields
         if (target && fieldRegex.test(target.tagName)) {
@@ -1540,9 +1569,7 @@ define("list-view/virtual_list_scroller_events",
       };
       cancelEvent = 'mouseout';
       handleCancel = function (e) {
-        if (e.relatedTarget) {
-          return;
-        }
+        if (e.relatedTarget) return;
         unbindWindow(this.scrollerEventHandlers);
         this.endScroll(e.timeStamp);
       };
@@ -1620,17 +1647,16 @@ define("list-view/virtual_list_scroller_events",
     }
   });
 define("list-view/virtual_list_view",
-  ["list-view/list_view_mixin","list-view/list_item_view_mixin","list-view/list_view_helper","list-view/virtual_list_scroller_events","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+  ["list-view/list_view_mixin","list-view/list_view_helper","list-view/virtual_list_scroller_events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     /*
       global Scroller
     */
 
     var ListViewMixin = __dependency1__["default"];
-    var TransformMixin = __dependency2__.TransformMixin;
-    var ListViewHelper = __dependency3__["default"];
-    var VirtualListScrollerEvents = __dependency4__["default"];
+    var ListViewHelper = __dependency2__["default"];
+    var VirtualListScrollerEvents = __dependency3__["default"];
 
     var max = Math.max, get = Ember.get, set = Ember.set;
 
@@ -1678,9 +1704,7 @@ define("list-view/virtual_list_view",
           // Support old and new Ember versions
           var state = view._state || view.state;
 
-          if (state !== 'inDOM') {
-            return;
-          }
+          if (state !== 'inDOM') { return; }
 
           if (view.listContainerElement) {
             view._scrollerTop = top;
@@ -1698,23 +1722,17 @@ define("list-view/virtual_list_view",
         updateScrollerDimensions(view);
       },
       setupPullToRefresh: function() {
-        if (!this.pullToRefreshViewClass) {
-          return;
-        }
-
+        if (!this.pullToRefreshViewClass) { return; }
         this._insertPullToRefreshView();
         this._activateScrollerPullToRefresh();
       },
       _insertPullToRefreshView: function(){
-        var pulldownClass = this.pullToRefreshViewClass.extend(TransformMixin);
-        this.pullToRefreshView = this.createChildView(pulldownClass);
+        this.pullToRefreshView = this.createChildView(this.pullToRefreshViewClass);
         this.insertAt(0, this.pullToRefreshView);
-
         var view = this;
-
         this.pullToRefreshView.on('didInsertElement', function(){
           Ember.run.schedule('afterRender', this, function(){
-            view.applyTransform(this, 0, -1 * view.pullToRefreshViewHeight);
+            view.applyTransform(this.get('element'), 0, -1 * view.pullToRefreshViewHeight);
           });
         });
       },
diff --git a/vendor/assets/javascripts/ember-cloaking.js b/vendor/assets/javascripts/ember-cloaking.js
index c207d93074..e318ba2871 100644
--- a/vendor/assets/javascripts/ember-cloaking.js
+++ b/vendor/assets/javascripts/ember-cloaking.js
@@ -8,13 +8,10 @@
     @namespace Ember
   **/
   Ember.CloakedCollectionView = Ember.CollectionView.extend({
-    cloakView: Ember.computed.alias('itemViewClass'),
     topVisible: null,
     bottomVisible: null,
     offsetFixedTopElement: null,
     offsetFixedBottomElement: null,
-    loadingHTML: 'Loading...',
-    scrollDebounce: 10,
 
     init: function() {
       var cloakView = this.get('cloakView'),
@@ -28,7 +25,7 @@
       this.set('itemViewClass', Ember.CloakedView.extend({
         classNames: [cloakView + '-cloak'],
         cloaks: cloakView,
-        preservesContext: this.get('preservesContext') === 'true',
+        preservesContext: this.get('preservesContext') === "true",
         cloaksController: this.get('itemController'),
         defaultHeight: this.get('defaultHeight'),
 
@@ -202,11 +199,12 @@
         var checkView = childViews[j];
         if (!checkView._containedView) {
           if (!checkView.get('loading')) {
-            checkView.$().html(this.get('loadingHTML'));
+            checkView.$().html(this.get('loadingHTML') || "Loading...");
           }
           return;
         }
       }
+
     },
 
     uncloakQueue: function(){
@@ -250,9 +248,8 @@
       var self = this,
           offsetFixedTop = this.get('offsetFixedTop') || this.get('offsetFixed'),
           offsetFixedBottom = this.get('offsetFixedBottom'),
-          scrollDebounce = this.get('scrollDebounce'),
           onScrollMethod = function() {
-            Ember.run.debounce(self, 'scrollTriggered', scrollDebounce);
+            Ember.run.debounce(self, 'scrollTriggered', 10);
           };
 
       if (offsetFixedTop) {
@@ -392,7 +389,8 @@
           loading: false
         });
 
-        this.setContainedView(this.createChildView(this.get('cloaks'), createArgs));
+        this._containedView = this.createChildView(this.get('cloaks'), createArgs);
+        this.rerender();
       }
     },
 
@@ -409,15 +407,25 @@
         this.set('style', style);
         this.$().prop('style', style);
 
-
         // We need to remove the container after the height of the element has taken
         // effect.
         Ember.run.schedule('afterRender', function() {
-          self.setContainedView(null);
+          if(self._containedView){
+            self._containedView.remove();
+            self._containedView = null;
+          }
         });
       }
     },
 
+    _removeContainedView: function(){
+      if(this._containedView){
+        this._containedView.remove();
+        this._containedView = null;
+      }
+      this._super();
+    }.on('willDestroyElement'),
+
     _setHeights: function(){
       if (!this._containedView) {
         // setting default height
@@ -431,9 +439,37 @@
           this.$().css('height', defaultHeight);
         }
       }
-     }.on('didInsertElement')
+     }.on('didInsertElement'),
+
+    /**
+      Render the cloaked view if applicable.
+
+      @method render
+    */
+    render: function(buffer) {
+      var containedView = this._containedView, self = this;
+
+      if (containedView && (containedView._state || containedView.state) !== 'inDOM') {
+        containedView.triggerRecursively('willInsertElement');
+        containedView.renderToBuffer(buffer);
+        if (Ember.View.prototype._transitionTo) {
+          containedView._transitionTo('inDOM');
+        } else {
+          containedView.transitionTo('inDOM');
+        }
+
+        Em.run.schedule('afterRender', function() {
+          if(self._containedView) {
+            self._containedView.triggerRecursively('didInsertElement');
+          }
+        });
+      }
+    }
+
   });
 
+
+
   Ember.Handlebars.registerHelper('cloaked-collection', function(options) {
     var hash = options.hash,
         types = options.hashTypes;
diff --git a/vendor/assets/javascripts/production/ember.js b/vendor/assets/javascripts/production/ember.js
index d036d87d4e..8a0ea9c7cc 100644
--- a/vendor/assets/javascripts/production/ember.js
+++ b/vendor/assets/javascripts/production/ember.js
@@ -5,24 +5,24 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   1.8.1
+ * @version   1.7.1
  */
 
 (function() {
-var enifed, requireModule, eriuqer, requirejs, Ember;
+var define, requireModule, require, requirejs, Ember;
 
 (function() {
   Ember = this.Ember = this.Ember || {};
-  if (typeof Ember === 'undefined') { Ember = {}; };
+  if (typeof Ember === 'undefined') { Ember = {} };
 
   if (typeof Ember.__loader === 'undefined') {
     var registry = {}, seen = {};
 
-    enifed = function(name, deps, callback) {
+    define = function(name, deps, callback) {
       registry[name] = { deps: deps, callback: callback };
     };
 
-    requirejs = eriuqer = requireModule = function(name) {
+    requirejs = require = requireModule = function(name) {
       if (seen.hasOwnProperty(name)) { return seen[name]; }
       seen[name] = {};
 
@@ -30,11 +30,11 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
         throw new Error("Could not find module " + name);
       }
 
-      var mod = registry[name];
-      var deps = mod.deps;
-      var callback = mod.callback;
-      var reified = [];
-      var exports;
+      var mod = registry[name],
+      deps = mod.deps,
+      callback = mod.callback,
+      reified = [],
+      exports;
 
       for (var i=0, l=deps.length; i<l; i++) {
         if (deps[i] === 'exports') {
@@ -65,34 +65,42 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
     };
     requirejs._eak_seen = registry;
 
-    Ember.__loader = {define: enifed, require: eriuqer, registry: registry};
+    Ember.__loader = {define: define, require: require, registry: registry};
   } else {
-    enifed = Ember.__loader.define;
-    requirejs = eriuqer = requireModule = Ember.__loader.require;
+    define = Ember.__loader.define;
+    requirejs = require = requireModule = Ember.__loader.require;
   }
 })();
 
-enifed("backburner",
-  ["backburner/utils","backburner/platform","backburner/binary-search","backburner/deferred-action-queues","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+define("backburner",
+  ["backburner/utils","backburner/deferred_action_queues","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var each = __dependency1__.each;
-    var isString = __dependency1__.isString;
-    var isFunction = __dependency1__.isFunction;
-    var isNumber = __dependency1__.isNumber;
-    var isCoercableNumber = __dependency1__.isCoercableNumber;
-    var wrapInTryCatch = __dependency1__.wrapInTryCatch;
-    var now = __dependency1__.now;
+    var Utils = __dependency1__["default"];
+    var DeferredActionQueues = __dependency2__.DeferredActionQueues;
 
-    var needsIETryCatchFix = __dependency2__.needsIETryCatchFix;
+    var slice = [].slice,
+        pop = [].pop,
+        each = Utils.each,
+        isString = Utils.isString,
+        isFunction = Utils.isFunction,
+        isNumber = Utils.isNumber,
+        timers = [],
+        global = this,
+        NUMBER = /\d+/;
 
-    var searchTimer = __dependency3__["default"];
+    // In IE 6-8, try/finally doesn't work without a catch.
+    // Unfortunately, this is impossible to test for since wrapping it in a parent try/catch doesn't trigger the bug.
+    // This tests for another broken try/catch behavior that only exhibits in the same versions of IE.
+    var needsIETryCatchFix = (function(e,x){
+      try{ x(); }
+      catch(e) { } // jshint ignore:line
+      return !!e;
+    })();
 
-    var DeferredActionQueues = __dependency4__["default"];
-
-    var slice = [].slice;
-    var pop = [].pop;
-    var global = this;
+    function isCoercableNumber(number) {
+      return isNumber(number) || NUMBER.test(number);
+    }
 
     function Backburner(queueNames, options) {
       this.queueNames = queueNames;
@@ -103,14 +111,18 @@ enifed("backburner",
       this.instanceStack = [];
       this._debouncees = [];
       this._throttlers = [];
-      this._timers = [];
     }
 
     Backburner.prototype = {
+      queueNames: null,
+      options: null,
+      currentInstance: null,
+      instanceStack: null,
+
       begin: function() {
-        var options = this.options;
-        var onBegin = options && options.onBegin;
-        var previousInstance = this.currentInstance;
+        var options = this.options,
+            onBegin = options && options.onBegin,
+            previousInstance = this.currentInstance;
 
         if (previousInstance) {
           this.instanceStack.push(previousInstance);
@@ -123,10 +135,10 @@ enifed("backburner",
       },
 
       end: function() {
-        var options = this.options;
-        var onEnd = options && options.onEnd;
-        var currentInstance = this.currentInstance;
-        var nextInstance = null;
+        var options = this.options,
+            onEnd = options && options.onEnd,
+            currentInstance = this.currentInstance,
+            nextInstance = null;
 
         // Prevent double-finally bug in Safari 6.0.2 and iOS 6
         // This bug appears to be resolved in Safari 6.0.5 and iOS 7
@@ -203,19 +215,8 @@ enifed("backburner",
           method = target[method];
         }
 
-        var stack = this.DEBUG ? new Error() : undefined;
-        var length = arguments.length;
-        var args;
-
-        if (length > 3) {
-          args = new Array(length - 3);
-          for (var i = 3; i < length; i++) {
-            args[i-3] = arguments[i];
-          }
-        } else {
-          args = undefined;
-        }
-
+        var stack = this.DEBUG ? new Error() : undefined,
+            args = arguments.length > 3 ? slice.call(arguments, 3) : undefined;
         if (!this.currentInstance) { createAutorun(this); }
         return this.currentInstance.schedule(queueName, target, method, args, false, stack);
       },
@@ -230,34 +231,15 @@ enifed("backburner",
           method = target[method];
         }
 
-        var stack = this.DEBUG ? new Error() : undefined;
-        var length = arguments.length;
-        var args;
-
-        if (length > 3) {
-          args = new Array(length - 3);
-          for (var i = 3; i < length; i++) {
-            args[i-3] = arguments[i];
-          }
-        } else {
-          args = undefined;
-        }
-
-        if (!this.currentInstance) {
-          createAutorun(this);
-        }
+        var stack = this.DEBUG ? new Error() : undefined,
+            args = arguments.length > 3 ? slice.call(arguments, 3) : undefined;
+        if (!this.currentInstance) { createAutorun(this); }
         return this.currentInstance.schedule(queueName, target, method, args, true, stack);
       },
 
       setTimeout: function() {
-        var l = arguments.length;
-        var args = new Array(l);
-
-        for (var x = 0; x < l; x++) {
-          args[x] = arguments[x];
-        }
-
-        var length = args.length,
+        var args = slice.call(arguments),
+            length = args.length,
             method, wait, target,
             methodOrTarget, methodOrWait, methodOrArgs;
 
@@ -303,7 +285,7 @@ enifed("backburner",
           }
         }
 
-        var executeAt = now() + parseInt(wait, 10);
+        var executeAt = (+new Date()) + parseInt(wait, 10);
 
         if (isString(method)) {
           method = target[method];
@@ -324,9 +306,9 @@ enifed("backburner",
         }
 
         // find position to insert
-        var i = searchTimer(executeAt, this._timers);
+        var i = searchTimer(executeAt, timers);
 
-        this._timers.splice(i, 0, executeAt, fn);
+        timers.splice(i, 0, executeAt, fn);
 
         updateLaterTimer(this, executeAt, wait);
 
@@ -334,10 +316,13 @@ enifed("backburner",
       },
 
       throttle: function(target, method /* , args, wait, [immediate] */) {
-        var backburner = this;
-        var args = arguments;
-        var immediate = pop.call(args);
-        var wait, throttler, index, timer;
+        var self = this,
+            args = arguments,
+            immediate = pop.call(args),
+            wait,
+            throttler,
+            index,
+            timer;
 
         if (isNumber(immediate) || isString(immediate)) {
           wait = immediate;
@@ -353,16 +338,16 @@ enifed("backburner",
 
         timer = global.setTimeout(function() {
           if (!immediate) {
-            backburner.run.apply(backburner, args);
+            self.run.apply(self, args);
           }
-          var index = findThrottler(target, method, backburner._throttlers);
+          var index = findThrottler(target, method, self._throttlers);
           if (index > -1) {
-            backburner._throttlers.splice(index, 1);
+            self._throttlers.splice(index, 1);
           }
         }, wait);
 
         if (immediate) {
-          this.run.apply(this, args);
+          self.run.apply(self, args);
         }
 
         throttler = [target, method, timer];
@@ -373,10 +358,13 @@ enifed("backburner",
       },
 
       debounce: function(target, method /* , args, wait, [immediate] */) {
-        var backburner = this;
-        var args = arguments;
-        var immediate = pop.call(args);
-        var wait, index, debouncee, timer;
+        var self = this,
+            args = arguments,
+            immediate = pop.call(args),
+            wait,
+            index,
+            debouncee,
+            timer;
 
         if (isNumber(immediate) || isString(immediate)) {
           wait = immediate;
@@ -397,25 +385,21 @@ enifed("backburner",
 
         timer = global.setTimeout(function() {
           if (!immediate) {
-            backburner.run.apply(backburner, args);
+            self.run.apply(self, args);
           }
-          var index = findDebouncee(target, method, backburner._debouncees);
+          var index = findDebouncee(target, method, self._debouncees);
           if (index > -1) {
-            backburner._debouncees.splice(index, 1);
+            self._debouncees.splice(index, 1);
           }
         }, wait);
 
         if (immediate && index === -1) {
-          backburner.run.apply(backburner, args);
+          self.run.apply(self, args);
         }
 
-        debouncee = [
-          target,
-          method,
-          timer
-        ];
+        debouncee = [target, method, timer];
 
-        backburner._debouncees.push(debouncee);
+        self._debouncees.push(debouncee);
 
         return debouncee;
       },
@@ -435,7 +419,7 @@ enifed("backburner",
           clearTimeout(this._laterTimer);
           this._laterTimer = null;
         }
-        this._timers = [];
+        timers = [];
 
         if (this._autorun) {
           clearTimeout(this._autorun);
@@ -444,7 +428,7 @@ enifed("backburner",
       },
 
       hasTimers: function() {
-        return !!this._timers.length || !!this._debouncees.length || !!this._throttlers.length || this._autorun;
+        return !!timers.length || !!this._debouncees.length || !!this._throttlers.length || this._autorun;
       },
 
       cancel: function(timer) {
@@ -453,18 +437,9 @@ enifed("backburner",
         if (timer && timerType === 'object' && timer.queue && timer.method) { // we're cancelling a deferOnce
           return timer.queue.cancel(timer);
         } else if (timerType === 'function') { // we're cancelling a setTimeout
-          for (var i = 0, l = this._timers.length; i < l; i += 2) {
-            if (this._timers[i + 1] === timer) {
-              this._timers.splice(i, 2); // remove the two elements
-              if (i === 0) {
-                if (this._laterTimer) { // Active timer? Then clear timer and reset for future timer
-                  clearTimeout(this._laterTimer);
-                  this._laterTimer = null;
-                }
-                if (this._timers.length > 0) { // Update to next available timer when available
-                  updateLaterTimer(this, this._timers[0], this._timers[0] - now());
-                }
-              }
+          for (var i = 0, l = timers.length; i < l; i += 2) {
+            if (timers[i + 1] === timer) {
+              timers.splice(i, 2); // remove the two elements
               return true;
             }
           }
@@ -477,17 +452,18 @@ enifed("backburner",
       },
 
       _cancelItem: function(findMethod, array, timer){
-        var item, index;
+        var item,
+            index;
 
         if (timer.length < 3) { return false; }
 
         index = findMethod(timer[0], timer[1], array);
 
-        if (index > -1) {
+        if(index > -1) {
 
           item = array[index];
 
-          if (item[2] === timer[2]) {
+          if(item[2] === timer[2]){
             array.splice(index, 1);
             clearTimeout(timer[2]);
             return true;
@@ -510,10 +486,21 @@ enifed("backburner",
       Backburner.prototype.end = wrapInTryCatch(originalEnd);
     }
 
+    function wrapInTryCatch(func) {
+      return function () {
+        try {
+          return func.apply(this, arguments);
+        } catch (e) {
+          throw e;
+        }
+      };
+    }
+
     function getOnError(options) {
       return options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
     }
 
+
     function createAutorun(backburner) {
       backburner.begin();
       backburner._autorun = global.setTimeout(function() {
@@ -522,48 +509,33 @@ enifed("backburner",
       });
     }
 
-    function updateLaterTimer(backburner, executeAt, wait) {
-      var n = now();
-      if (!backburner._laterTimer || executeAt < backburner._laterTimerExpiresAt || backburner._laterTimerExpiresAt < n) {
-
-        if (backburner._laterTimer) {
-          // Clear when:
-          // - Already expired
-          // - New timer is earlier
-          clearTimeout(backburner._laterTimer);
-
-          if (backburner._laterTimerExpiresAt < n) { // If timer was never triggered
-            // Calculate the left-over wait-time
-            wait = Math.max(0, executeAt - n);
-          }
-        }
-
-        backburner._laterTimer = global.setTimeout(function() {
-          backburner._laterTimer = null;
-          backburner._laterTimerExpiresAt = null;
-          executeTimers(backburner);
+    function updateLaterTimer(self, executeAt, wait) {
+      if (!self._laterTimer || executeAt < self._laterTimerExpiresAt) {
+        self._laterTimer = global.setTimeout(function() {
+          self._laterTimer = null;
+          self._laterTimerExpiresAt = null;
+          executeTimers(self);
         }, wait);
-
-        backburner._laterTimerExpiresAt = n + wait;
+        self._laterTimerExpiresAt = executeAt;
       }
     }
 
-    function executeTimers(backburner) {
-      var n = now();
-      var fns, i, l;
+    function executeTimers(self) {
+      var now = +new Date(),
+          time, fns, i, l;
 
-      backburner.run(function() {
-        i = searchTimer(n, backburner._timers);
+      self.run(function() {
+        i = searchTimer(now, timers);
 
-        fns = backburner._timers.splice(0, i);
+        fns = timers.splice(0, i);
 
         for (i = 1, l = fns.length; i < l; i += 2) {
-          backburner.schedule(backburner.options.defaultQueue, null, fns[i]);
+          self.schedule(self.options.defaultQueue, null, fns[i]);
         }
       });
 
-      if (backburner._timers.length) {
-        updateLaterTimer(backburner, backburner._timers[0], backburner._timers[0] - n);
+      if (timers.length) {
+        updateLaterTimer(self, timers[0], timers[0] - now);
       }
     }
 
@@ -576,8 +548,8 @@ enifed("backburner",
     }
 
     function findItem(target, method, collection) {
-      var item;
-      var index = -1;
+      var item,
+          index = -1;
 
       for (var i = 0, l = collection.length; i < l; i++) {
         item = collection[i];
@@ -590,31 +562,10 @@ enifed("backburner",
       return index;
     }
 
-    __exports__["default"] = Backburner;
-  });
-enifed("backburner.umd",
-  ["./backburner"],
-  function(__dependency1__) {
-    "use strict";
-    var Backburner = __dependency1__["default"];
-
-    /* global define:true module:true window: true */
-    if (typeof enifed === 'function' && enifed.amd) {
-      enifed(function() { return Backburner; });
-    } else if (typeof module !== 'undefined' && module.exports) {
-      module.exports = Backburner;
-    } else if (typeof this !== 'undefined') {
-      this['Backburner'] = Backburner;
-    }
-  });
-enifed("backburner/binary-search",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    __exports__["default"] = function binarySearch(time, timers) {
-      var start = 0;
-      var end = timers.length - 2;
-      var middle, l;
+    function searchTimer(time, timers) {
+      var start = 0,
+          end = timers.length - 2,
+          middle, l;
 
       while (start < end) {
         // since timers is an array of pairs 'l' will always
@@ -634,14 +585,18 @@ enifed("backburner/binary-search",
 
       return (time >= timers[start]) ? start + 2 : start;
     }
+
+    __exports__.Backburner = Backburner;
   });
-enifed("backburner/deferred-action-queues",
-  ["./utils","./queue","exports"],
+define("backburner/deferred_action_queues",
+  ["backburner/utils","backburner/queue","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var each = __dependency1__.each;
-    var isString = __dependency1__.isString;
-    var Queue = __dependency2__["default"];
+    var Utils = __dependency1__["default"];
+    var Queue = __dependency2__.Queue;
+
+    var each = Utils.each,
+        isString = Utils.isString;
 
     function DeferredActionQueues(queueNames, options) {
       var queues = this.queues = {};
@@ -650,20 +605,20 @@ enifed("backburner/deferred-action-queues",
       this.options = options;
 
       each(queueNames, function(queueName) {
-        queues[queueName] = new Queue(queueName, options[queueName], options);
+        queues[queueName] = new Queue(this, queueName, options);
       });
     }
 
-    function noSuchQueue(name) {
-      throw new Error("You attempted to schedule an action in a queue (" + name + ") that doesn't exist");
-    }
-
     DeferredActionQueues.prototype = {
-      schedule: function(name, target, method, args, onceFlag, stack) {
-        var queues = this.queues;
-        var queue = queues[name];
+      queueNames: null,
+      queues: null,
+      options: null,
 
-        if (!queue) { noSuchQueue(name); }
+      schedule: function(queueName, target, method, args, onceFlag, stack) {
+        var queues = this.queues,
+            queue = queues[queueName];
+
+        if (!queue) { throw new Error("You attempted to schedule an action in a queue (" + queueName + ") that doesn't exist"); }
 
         if (onceFlag) {
           return queue.pushUnique(target, method, args, stack);
@@ -672,7 +627,7 @@ enifed("backburner/deferred-action-queues",
         }
       },
 
-      invoke: function(target, method, args, _, _errorRecordedForStack) {
+      invoke: function(target, method, args, _) {
         if (args && args.length > 0) {
           method.apply(target, args);
         } else {
@@ -680,7 +635,7 @@ enifed("backburner/deferred-action-queues",
         }
       },
 
-      invokeWithOnError: function(target, method, args, onError, errorRecordedForStack) {
+      invokeWithOnError: function(target, method, args, onError) {
         try {
           if (args && args.length > 0) {
             method.apply(target, args);
@@ -688,80 +643,59 @@ enifed("backburner/deferred-action-queues",
             method.call(target);
           }
         } catch(error) {
-          onError(error, errorRecordedForStack);
+          onError(error);
         }
       },
 
       flush: function() {
-        var queues = this.queues;
-        var queueNames = this.queueNames;
-        var queueName, queue, queueItems, priorQueueNameIndex;
-        var queueNameIndex = 0;
-        var numberOfQueues = queueNames.length;
-        var options = this.options;
-        var onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
-        var invoke = onError ? this.invokeWithOnError : this.invoke;
+        var queues = this.queues,
+            queueNames = this.queueNames,
+            queueName, queue, queueItems, priorQueueNameIndex,
+            queueNameIndex = 0, numberOfQueues = queueNames.length,
+            options = this.options,
+            onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]),
+            invoke = onError ? this.invokeWithOnError : this.invoke;
 
+        outerloop:
         while (queueNameIndex < numberOfQueues) {
           queueName = queueNames[queueNameIndex];
           queue = queues[queueName];
           queueItems = queue._queueBeingFlushed = queue._queue.slice();
           queue._queue = [];
-          queue.targetQueues = Object.create(null);
 
-          var queueOptions = queue.options; // TODO: write a test for this
-          var before = queueOptions && queueOptions.before;
-          var after = queueOptions && queueOptions.after;
-          var target, method, args, errorRecordedForStack;
-          var queueIndex = 0;
-          var numberOfQueueItems = queueItems.length;
+          var queueOptions = queue.options, // TODO: write a test for this
+              before = queueOptions && queueOptions.before,
+              after = queueOptions && queueOptions.after,
+              target, method, args, stack,
+              queueIndex = 0, numberOfQueueItems = queueItems.length;
 
-          if (numberOfQueueItems && before) {
-            before();
-          }
+          if (numberOfQueueItems && before) { before(); }
 
           while (queueIndex < numberOfQueueItems) {
-            target                = queueItems[queueIndex];
-            method                = queueItems[queueIndex+1];
-            args                  = queueItems[queueIndex+2];
-            errorRecordedForStack = queueItems[queueIndex+3]; // Debugging assistance
+            target = queueItems[queueIndex];
+            method = queueItems[queueIndex+1];
+            args   = queueItems[queueIndex+2];
+            stack  = queueItems[queueIndex+3]; // Debugging assistance
 
-            //
-
-            if (isString(method)) {
-              method = target[method];
-            }
+            if (isString(method)) { method = target[method]; }
 
             // method could have been nullified / canceled during flush
             if (method) {
-              //
-              //    ** Attention intrepid developer **
-              //
-              //    To find out the stack of this task when it was scheduled onto
-              //    the run loop, add the following to your app.js:
-              //
-              //    Ember.run.backburner.DEBUG = true; // NOTE: This slows your app, don't leave it on in production.
-              //
-              //    Once that is in place, when you are at a breakpoint and navigate
-              //    here in the stack explorer, you can look at `errorRecordedForStack.stack`,
-              //    which will be the captured stack when this job was scheduled.
-              //
-              invoke(target, method, args, onError, errorRecordedForStack);
+              invoke(target, method, args, onError);
             }
 
             queueIndex += 4;
           }
 
           queue._queueBeingFlushed = null;
-          if (numberOfQueueItems && after) {
-            after();
-          }
+          if (numberOfQueueItems && after) { after(); }
 
           if ((priorQueueNameIndex = indexOfPriorQueueWithActions(this, queueNameIndex)) !== -1) {
             queueNameIndex = priorQueueNameIndex;
-          } else {
-            queueNameIndex++;
+            continue outerloop;
           }
+
+          queueNameIndex++;
         }
       }
     };
@@ -778,134 +712,60 @@ enifed("backburner/deferred-action-queues",
       return -1;
     }
 
-    __exports__["default"] = DeferredActionQueues;
+    __exports__.DeferredActionQueues = DeferredActionQueues;
   });
-enifed("backburner/platform",
+define("backburner/queue",
   ["exports"],
   function(__exports__) {
     "use strict";
-    // In IE 6-8, try/finally doesn't work without a catch.
-    // Unfortunately, this is impossible to test for since wrapping it in a parent try/catch doesn't trigger the bug.
-    // This tests for another broken try/catch behavior that only exhibits in the same versions of IE.
-    var needsIETryCatchFix = (function(e,x){
-      try{ x(); }
-      catch(e) { } // jshint ignore:line
-      return !!e;
-    })();
-    __exports__.needsIETryCatchFix = needsIETryCatchFix;
-  });
-enifed("backburner/queue",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    function Queue(name, options, globalOptions) {
+    function Queue(daq, name, options) {
+      this.daq = daq;
       this.name = name;
-      this.globalOptions = globalOptions || {};
-      this.options = options;
+      this.globalOptions = options;
+      this.options = options[name];
       this._queue = [];
-      this.targetQueues = Object.create(null);
-      this._queueBeingFlushed = undefined;
     }
 
     Queue.prototype = {
+      daq: null,
+      name: null,
+      options: null,
+      onError: null,
+      _queue: null,
+
       push: function(target, method, args, stack) {
         var queue = this._queue;
         queue.push(target, method, args, stack);
-
-        return {
-          queue: this,
-          target: target,
-          method: method
-        };
-      },
-
-      pushUniqueWithoutGuid: function(target, method, args, stack) {
-        var queue = this._queue;
-
-        for (var i = 0, l = queue.length; i < l; i += 4) {
-          var currentTarget = queue[i];
-          var currentMethod = queue[i+1];
-
-          if (currentTarget === target && currentMethod === method) {
-            queue[i+2] = args;  // replace args
-            queue[i+3] = stack; // replace stack
-            return;
-          }
-        }
-
-        queue.push(target, method, args, stack);
-      },
-
-      targetQueue: function(targetQueue, target, method, args, stack) {
-        var queue = this._queue;
-
-        for (var i = 0, l = targetQueue.length; i < l; i += 4) {
-          var currentMethod = targetQueue[i];
-          var currentIndex  = targetQueue[i + 1];
-
-          if (currentMethod === method) {
-            queue[currentIndex + 2] = args;  // replace args
-            queue[currentIndex + 3] = stack; // replace stack
-            return;
-          }
-        }
-
-        targetQueue.push(
-          method,
-          queue.push(target, method, args, stack) - 4
-        );
-      },
-
-      pushUniqueWithGuid: function(guid, target, method, args, stack) {
-        var hasLocalQueue = this.targetQueues[guid];
-
-        if (hasLocalQueue) {
-          this.targetQueue(hasLocalQueue, target, method, args, stack);
-        } else {
-          this.targetQueues[guid] = [
-            method,
-            this._queue.push(target, method, args, stack) - 4
-          ];
-        }
-
-        return {
-          queue: this,
-          target: target,
-          method: method
-        };
+        return {queue: this, target: target, method: method};
       },
 
       pushUnique: function(target, method, args, stack) {
         var queue = this._queue, currentTarget, currentMethod, i, l;
-        var KEY = this.globalOptions.GUID_KEY;
 
-        if (target && KEY) {
-          var guid = target[KEY];
-          if (guid) {
-            return this.pushUniqueWithGuid(guid, target, method, args, stack);
+        for (i = 0, l = queue.length; i < l; i += 4) {
+          currentTarget = queue[i];
+          currentMethod = queue[i+1];
+
+          if (currentTarget === target && currentMethod === method) {
+            queue[i+2] = args; // replace args
+            queue[i+3] = stack; // replace stack
+            return {queue: this, target: target, method: method};
           }
         }
 
-        this.pushUniqueWithoutGuid(target, method, args, stack);
-
-        return {
-          queue: this,
-          target: target,
-          method: method
-        };
+        queue.push(target, method, args, stack);
+        return {queue: this, target: target, method: method};
       },
 
       // TODO: remove me, only being used for Ember.run.sync
       flush: function() {
-        var queue = this._queue;
-        var globalOptions = this.globalOptions;
-        var options = this.options;
-        var before = options && options.before;
-        var after = options && options.after;
-        var onError = globalOptions.onError || (globalOptions.onErrorTarget && globalOptions.onErrorTarget[globalOptions.onErrorMethod]);
-        var target, method, args, stack, i, l = queue.length;
-
-        this.targetQueues = Object.create(null);
+        var queue = this._queue,
+            globalOptions = this.globalOptions,
+            options = this.options,
+            before = options && options.before,
+            after = options && options.after,
+            onError = globalOptions.onError || (globalOptions.onErrorTarget && globalOptions.onErrorTarget[globalOptions.onErrorMethod]),
+            target, method, args, stack, i, l = queue.length;
 
         if (l && before) { before(); }
         for (i = 0; i < l; i += 4) {
@@ -950,28 +810,12 @@ enifed("backburner/queue",
 
       cancel: function(actionToCancel) {
         var queue = this._queue, currentTarget, currentMethod, i, l;
-        var target = actionToCancel.target;
-        var method = actionToCancel.method;
-        var GUID_KEY = this.globalOptions.GUID_KEY;
-
-        if (GUID_KEY && this.targetQueues && target) {
-          var targetQueue = this.targetQueues[target[GUID_KEY]];
-
-          if (targetQueue) {
-            for (i = 0, l = targetQueue.length; i < l; i++) {
-              if (targetQueue[i] === method) {
-                targetQueue.splice(i, 1);
-              }
-            }
-          }
-        }
 
         for (i = 0, l = queue.length; i < l; i += 4) {
           currentTarget = queue[i];
           currentMethod = queue[i+1];
 
-          if (currentTarget === target &&
-              currentMethod === method) {
+          if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
             queue.splice(i, 4);
             return true;
           }
@@ -987,8 +831,7 @@ enifed("backburner/queue",
           currentTarget = queue[i];
           currentMethod = queue[i+1];
 
-          if (currentTarget === target &&
-              currentMethod === method) {
+          if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
             // don't mess with array during flush
             // just nullify the method
             queue[i+1] = null;
@@ -998,63 +841,44 @@ enifed("backburner/queue",
       }
     };
 
-    __exports__["default"] = Queue;
+    __exports__.Queue = Queue;
   });
-enifed("backburner/utils",
+define("backburner/utils",
   ["exports"],
   function(__exports__) {
     "use strict";
-    var NUMBER = /\d+/;
-
-    function each(collection, callback) {
-      for (var i = 0; i < collection.length; i++) {
-        callback(collection[i]);
-      }
-    }
-
-    __exports__.each = each;// Date.now is not available in browsers < IE9
-    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/now#Compatibility
-    var now = Date.now || function() { return new Date().getTime(); };
-    __exports__.now = now;
-    function isString(suspect) {
-      return typeof suspect === 'string';
-    }
-
-    __exports__.isString = isString;function isFunction(suspect) {
-      return typeof suspect === 'function';
-    }
-
-    __exports__.isFunction = isFunction;function isNumber(suspect) {
-      return typeof suspect === 'number';
-    }
-
-    __exports__.isNumber = isNumber;function isCoercableNumber(number) {
-      return isNumber(number) || NUMBER.test(number);
-    }
-
-    __exports__.isCoercableNumber = isCoercableNumber;function wrapInTryCatch(func) {
-      return function () {
-        try {
-          return func.apply(this, arguments);
-        } catch (e) {
-          throw e;
+    __exports__["default"] = {
+      each: function(collection, callback) {
+        for (var i = 0; i < collection.length; i++) {
+          callback(collection[i]);
         }
-      };
-    }
+      },
 
-    __exports__.wrapInTryCatch = wrapInTryCatch;
+      isString: function(suspect) {
+        return typeof suspect === 'string';
+      },
+
+      isFunction: function(suspect) {
+        return typeof suspect === 'function';
+      },
+
+      isNumber: function(suspect) {
+        return typeof suspect === 'number';
+      }
+    };
   });
-enifed("calculateVersion",
+
+define("calculateVersion",
   [],
   function() {
     "use strict";
     'use strict';
 
-    var fs   = eriuqer('fs');
-    var path = eriuqer('path');
+    var fs   = require('fs');
+    var path = require('path');
 
     module.exports = function () {
-      var packageVersion = eriuqer('../package.json').version;
+      var packageVersion = require('../package.json').version;
       var output         = [packageVersion];
       var gitPath        = path.join(__dirname,'..','.git');
       var headFilePath   = path.join(gitPath, 'HEAD');
@@ -1085,7 +909,7 @@ enifed("calculateVersion",
       }
     };
   });
-enifed("container",
+define("container",
   ["container/container","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -1112,14 +936,13 @@ enifed("container",
 
     __exports__["default"] = Container;
   });
-enifed("container/container",
-  ["ember-metal/core","ember-metal/keys","ember-metal/dictionary","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+define("container/container",
+  ["container/inheriting_dict","ember-metal/core","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
+    var InheritingDict = __dependency1__["default"];
+    var Ember = __dependency2__["default"];
     // Ember.assert
-    var emberKeys = __dependency2__["default"];
-    var dictionary = __dependency3__["default"];
 
     // A lightweight container that helps to assemble and decouple components.
     // Public api for the container is still in flux.
@@ -1130,19 +953,18 @@ enifed("container/container",
 
       this.resolver = parent && parent.resolver || function() {};
 
-      this.registry       = dictionary(parent ? parent.registry : null);
-      this.cache          = dictionary(parent ? parent.cache : null);
-      this.factoryCache   = dictionary(parent ? parent.factoryCache : null);
-      this.resolveCache   = dictionary(parent ? parent.resolveCache : null);
-      this.typeInjections = dictionary(parent ? parent.typeInjections : null);
-      this.injections     = dictionary(null);
-      this.normalizeCache = dictionary(null);
+      this.registry = new InheritingDict(parent && parent.registry);
+      this.cache = new InheritingDict(parent && parent.cache);
+      this.factoryCache = new InheritingDict(parent && parent.factoryCache);
+      this.resolveCache = new InheritingDict(parent && parent.resolveCache);
+      this.typeInjections = new InheritingDict(parent && parent.typeInjections);
+      this.injections = {};
 
-      this.factoryTypeInjections = dictionary(parent ? parent.factoryTypeInjections : null);
-      this.factoryInjections     = dictionary(null);
+      this.factoryTypeInjections = new InheritingDict(parent && parent.factoryTypeInjections);
+      this.factoryInjections = {};
 
-      this._options     = dictionary(parent ? parent._options : null);
-      this._typeOptions = dictionary(parent ? parent._typeOptions : null);
+      this._options = new InheritingDict(parent && parent._options);
+      this._typeOptions = new InheritingDict(parent && parent._typeOptions);
     }
 
     Container.prototype = {
@@ -1262,12 +1084,12 @@ enifed("container/container",
 
         var normalizedName = this.normalize(fullName);
 
-        if (normalizedName in this.cache) {
+        if (this.cache.has(normalizedName)) {
           throw new Error('Cannot re-register: `' + fullName +'`, as it has already been looked up.');
         }
 
-        this.registry[normalizedName] = factory;
-        this._options[normalizedName] = (options || {});
+        this.registry.set(normalizedName, factory);
+        this._options.set(normalizedName, options || {});
       },
 
       /**
@@ -1290,11 +1112,11 @@ enifed("container/container",
         
         var normalizedName = this.normalize(fullName);
 
-        delete this.registry[normalizedName];
-        delete this.cache[normalizedName];
-        delete this.factoryCache[normalizedName];
-        delete this.resolveCache[normalizedName];
-        delete this._options[normalizedName];
+        this.registry.remove(normalizedName);
+        this.cache.remove(normalizedName);
+        this.factoryCache.remove(normalizedName);
+        this.resolveCache.remove(normalizedName);
+        this._options.remove(normalizedName);
       },
 
       /**
@@ -1352,25 +1174,12 @@ enifed("container/container",
       /**
         A hook to enable custom fullName normalization behaviour
 
-        @method normalizeFullName
-        @param {String} fullName
-        @return {string} normalized fullName
-      */
-      normalizeFullName: function(fullName) {
-        return fullName;
-      },
-
-      /**
-        normalize a fullName based on the applications conventions
-
         @method normalize
         @param {String} fullName
         @return {string} normalized fullName
       */
       normalize: function(fullName) {
-        return this.normalizeCache[fullName] || (
-          this.normalizeCache[fullName] = this.normalizeFullName(fullName)
-        );
+        return fullName;
       },
 
       /**
@@ -1480,7 +1289,7 @@ enifed("container/container",
       optionsForType: function(type, options) {
         if (this.parent) { illegalChildOperation('optionsForType'); }
 
-        this._typeOptions[type] = options;
+        this._typeOptions.set(type, options);
       },
 
       /**
@@ -1528,14 +1337,12 @@ enifed("container/container",
         @param {String} fullName
       */
       typeInjection: function(type, property, fullName) {
-        
-        if (this.parent) { illegalChildOperation('typeInjection'); }
+                if (this.parent) { illegalChildOperation('typeInjection'); }
 
         var fullNameType = fullName.split(':')[0];
-        if (fullNameType === type) {
+        if(fullNameType === type) {
           throw new Error('Cannot inject a `' + fullName + '` on other ' + type + '(s). Register the `' + fullName + '` as a different type and perform the typeInjection.');
         }
-
         addTypeInjection(this.typeInjections, type, property, fullName);
       },
 
@@ -1595,7 +1402,7 @@ enifed("container/container",
 
                 var normalizedName = this.normalize(fullName);
 
-        if (this.cache[normalizedName]) {
+        if (this.cache.has(normalizedName)) {
           throw new Error("Attempted to register an injection for a type that has already been looked up. ('" + normalizedName + "', '" + property + "', '" + injectionName + "')");
         }
         addInjection(this.injections, normalizedName, property, normalizedInjectionName);
@@ -1699,7 +1506,7 @@ enifed("container/container",
         }
 
         
-        if (this.factoryCache[normalizedName]) {
+        if (this.factoryCache.has(normalizedName)) {
           throw new Error('Attempted to register a factoryInjection for a type that has already ' +
             'been looked up. (\'' + normalizedName + '\', \'' + property + '\', \'' + injectionName + '\')');
         }
@@ -1741,17 +1548,17 @@ enifed("container/container",
     };
 
     function resolve(container, normalizedName) {
-      var cached = container.resolveCache[normalizedName];
+      var cached = container.resolveCache.get(normalizedName);
       if (cached) { return cached; }
 
-      var resolved = container.resolver(normalizedName) || container.registry[normalizedName];
-      container.resolveCache[normalizedName] = resolved;
+      var resolved = container.resolver(normalizedName) || container.registry.get(normalizedName);
+      container.resolveCache.set(normalizedName, resolved);
 
       return resolved;
     }
 
     function has(container, fullName){
-      if (container.cache[fullName]) {
+      if (container.cache.has(fullName)) {
         return true;
       }
 
@@ -1761,8 +1568,8 @@ enifed("container/container",
     function lookup(container, fullName, options) {
       options = options || {};
 
-      if (container.cache[fullName] && options.singleton !== false) {
-        return container.cache[fullName];
+      if (container.cache.has(fullName) && options.singleton !== false) {
+        return container.cache.get(fullName);
       }
 
       var value = instantiate(container, fullName);
@@ -1770,7 +1577,7 @@ enifed("container/container",
       if (value === undefined) { return; }
 
       if (isSingleton(container, fullName) && options.singleton !== false) {
-        container.cache[fullName] = value;
+        container.cache.set(fullName, value);
       }
 
       return value;
@@ -1808,14 +1615,14 @@ enifed("container/container",
     }
 
     function option(container, fullName, optionName) {
-      var options = container._options[fullName];
+      var options = container._options.get(fullName);
 
       if (options && options[optionName] !== undefined) {
         return options[optionName];
       }
 
       var type = fullName.split(':')[0];
-      options = container._typeOptions[type];
+      options = container._typeOptions.get(type);
 
       if (options) {
         return options[optionName];
@@ -1824,8 +1631,8 @@ enifed("container/container",
 
     function factoryFor(container, fullName) {
       var cache = container.factoryCache;
-      if (cache[fullName]) {
-        return cache[fullName];
+      if (cache.has(fullName)) {
+        return cache.get(fullName);
       }
       var factory = container.resolve(fullName);
       if (factory === undefined) { return; }
@@ -1834,7 +1641,6 @@ enifed("container/container",
       if (!factory || typeof factory.extend !== 'function' || (!Ember.MODEL_FACTORY_INJECTIONS && type === 'model')) {
         // TODO: think about a 'safe' merge style extension
         // for now just fallback to create time injection
-        cache[fullName] = factory;
         return factory;
       } else {
         var injections = injectionsFor(container, fullName);
@@ -1845,18 +1651,18 @@ enifed("container/container",
         var injectedFactory = factory.extend(injections);
         injectedFactory.reopenClass(factoryInjections);
 
-        cache[fullName] = injectedFactory;
+        cache.set(fullName, injectedFactory);
 
         return injectedFactory;
       }
     }
 
     function injectionsFor(container, fullName) {
-      var splitName = fullName.split(':');
-      var type = splitName[0];
-      var injections = [];
+      var splitName = fullName.split(':'),
+        type = splitName[0],
+        injections = [];
 
-      injections = injections.concat(container.typeInjections[type] || []);
+      injections = injections.concat(container.typeInjections.get(type) || []);
       injections = injections.concat(container.injections[fullName] || []);
 
       injections = buildInjections(container, injections);
@@ -1867,11 +1673,11 @@ enifed("container/container",
     }
 
     function factoryInjectionsFor(container, fullName) {
-      var splitName = fullName.split(':');
-      var type = splitName[0];
-      var factoryInjections = [];
+      var splitName = fullName.split(':'),
+        type = splitName[0],
+        factoryInjections = [];
 
-      factoryInjections = factoryInjections.concat(container.factoryTypeInjections[type] || []);
+      factoryInjections = factoryInjections.concat(container.factoryTypeInjections.get(type) || []);
       factoryInjections = factoryInjections.concat(container.factoryInjections[fullName] || []);
 
       factoryInjections = buildInjections(container, factoryInjections);
@@ -1906,34 +1712,26 @@ enifed("container/container",
     }
 
     function eachDestroyable(container, callback) {
-      var cache = container.cache;
-      var keys = emberKeys(cache);
-      var key, value;
-
-      for (var i = 0, l = keys.length; i < l; i++) {
-        key = keys[i];
-        value = cache[key];
-
-        if (option(container, key, 'instantiate') !== false) {
-          callback(value);
-        }
-      }
+      container.cache.eachLocal(function(key, value) {
+        if (option(container, key, 'instantiate') === false) { return; }
+        callback(value);
+      });
     }
 
     function resetCache(container) {
-      eachDestroyable(container, function(value) {
+      container.cache.eachLocal(function(key, value) {
+        if (option(container, key, 'instantiate') === false) { return; }
         value.destroy();
       });
-
-      container.cache.dict = dictionary(null);
+      container.cache.dict = {};
     }
 
     function addTypeInjection(rules, type, property, fullName) {
-      var injections = rules[type];
+      var injections = rules.get(type);
 
       if (!injections) {
         injections = [];
-        rules[type] = injections;
+        rules.set(type, injections);
       }
 
       injections.push({
@@ -1952,15 +1750,126 @@ enifed("container/container",
 
     function addInjection(rules, factoryName, property, injectionName) {
       var injections = rules[factoryName] = rules[factoryName] || [];
-      injections.push({
-        property: property,
-        fullName: injectionName
-      });
+      injections.push({ property: property, fullName: injectionName });
     }
 
     __exports__["default"] = Container;
   });
-enifed("ember-application",
+define("container/inheriting_dict",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    // A safe and simple inheriting object.
+    function InheritingDict(parent) {
+      this.parent = parent;
+      this.dict = {};
+    }
+
+    InheritingDict.prototype = {
+
+      /**
+        @property parent
+        @type InheritingDict
+        @default null
+      */
+
+      parent: null,
+
+      /**
+        Object used to store the current nodes data.
+
+        @property dict
+        @type Object
+        @default Object
+      */
+      dict: null,
+
+      /**
+        Retrieve the value given a key, if the value is present at the current
+        level use it, otherwise walk up the parent hierarchy and try again. If
+        no matching key is found, return undefined.
+
+        @method get
+        @param {String} key
+        @return {any}
+      */
+      get: function(key) {
+        var dict = this.dict;
+
+        if (dict.hasOwnProperty(key)) {
+          return dict[key];
+        }
+
+        if (this.parent) {
+          return this.parent.get(key);
+        }
+      },
+
+      /**
+        Set the given value for the given key, at the current level.
+
+        @method set
+        @param {String} key
+        @param {Any} value
+      */
+      set: function(key, value) {
+        this.dict[key] = value;
+      },
+
+      /**
+        Delete the given key
+
+        @method remove
+        @param {String} key
+      */
+      remove: function(key) {
+        delete this.dict[key];
+      },
+
+      /**
+        Check for the existence of given a key, if the key is present at the current
+        level return true, otherwise walk up the parent hierarchy and try again. If
+        no matching key is found, return false.
+
+        @method has
+        @param {String} key
+        @return {Boolean}
+      */
+      has: function(key) {
+        var dict = this.dict;
+
+        if (dict.hasOwnProperty(key)) {
+          return true;
+        }
+
+        if (this.parent) {
+          return this.parent.has(key);
+        }
+
+        return false;
+      },
+
+      /**
+        Iterate and invoke a callback for each local key-value pair.
+
+        @method eachLocal
+        @param {Function} callback
+        @param {Object} binding
+      */
+      eachLocal: function(callback, binding) {
+        var dict = this.dict;
+
+        for (var prop in dict) {
+          if (dict.hasOwnProperty(prop)) {
+            callback.call(binding, prop, dict[prop]);
+          }
+        }
+      }
+    };
+
+    __exports__["default"] = InheritingDict;
+  });
+define("ember-application",
   ["ember-metal/core","ember-runtime/system/lazy_load","ember-application/system/dag","ember-application/system/resolver","ember-application/system/application","ember-application/ext/controller"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
     "use strict";
@@ -1988,7 +1897,7 @@ enifed("ember-application",
 
     runLoadHooks('Ember.Application', Application);
   });
-enifed("ember-application/ext/controller",
+define("ember-application/ext/controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/error","ember-metal/utils","ember-metal/computed","ember-runtime/mixins/controller","ember-routing/system/controller_for","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -2009,8 +1918,7 @@ enifed("ember-application/ext/controller",
     var controllerFor = __dependency8__["default"];
 
     function verifyNeedsDependencies(controller, container, needs) {
-      var dependency, i, l;
-      var missing = [];
+      var dependency, i, l, missing = [];
 
       for (i=0, l=needs.length; i<l; i++) {
         dependency = needs[i];
@@ -2037,9 +1945,8 @@ enifed("ember-application/ext/controller",
         needs: get(controller, 'needs'),
         container: get(controller, 'container'),
         unknownProperty: function(controllerName) {
-          var needs = this.needs;
-          var dependency, i, l;
-
+          var needs = this.needs,
+            dependency, i, l;
           for (i=0, l=needs.length; i<l; i++) {
             dependency = needs[i];
             if (dependency === controllerName) {
@@ -2162,9 +2069,9 @@ enifed("ember-application/ext/controller",
 
     __exports__["default"] = ControllerMixin;
   });
-enifed("ember-application/system/application",
-  ["ember-metal","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-application/system/dag","ember-runtime/system/namespace","ember-runtime/mixins/deferred","ember-application/system/resolver","ember-metal/platform","ember-metal/run_loop","ember-metal/utils","container/container","ember-runtime/controllers/controller","ember-metal/enumerable_utils","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-handlebars/controls/select","ember-views/system/event_dispatcher","ember-views/system/jquery","ember-routing/system/route","ember-routing/system/router","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/location/none_location","ember-routing/system/cache","ember-metal/core","ember-handlebars-compiler","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __exports__) {
+define("ember-application/system/application",
+  ["ember-metal","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-application/system/dag","ember-runtime/system/namespace","ember-runtime/mixins/deferred","ember-application/system/resolver","ember-metal/platform","ember-metal/run_loop","ember-metal/utils","container/container","ember-runtime/controllers/controller","ember-metal/enumerable_utils","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-views/system/event_dispatcher","ember-views/system/jquery","ember-routing/system/route","ember-routing/system/router","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/location/none_location","ember-routing/system/cache","ember-metal/core","ember-handlebars-compiler","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -2188,31 +2095,21 @@ enifed("ember-application/system/application",
     var EnumerableUtils = __dependency14__["default"];
     var ObjectController = __dependency15__["default"];
     var ArrayController = __dependency16__["default"];
-    var SelectView = __dependency17__["default"];
-    var EventDispatcher = __dependency18__["default"];
+    var EventDispatcher = __dependency17__["default"];
     //import ContainerDebugAdapter from "ember-extension-support/container_debug_adapter";
-    var jQuery = __dependency19__["default"];
-    var Route = __dependency20__["default"];
-    var Router = __dependency21__["default"];
-    var HashLocation = __dependency22__["default"];
-    var HistoryLocation = __dependency23__["default"];
-    var AutoLocation = __dependency24__["default"];
-    var NoneLocation = __dependency25__["default"];
-    var BucketCache = __dependency26__["default"];
+    var jQuery = __dependency18__["default"];
+    var Route = __dependency19__["default"];
+    var Router = __dependency20__["default"];
+    var HashLocation = __dependency21__["default"];
+    var HistoryLocation = __dependency22__["default"];
+    var AutoLocation = __dependency23__["default"];
+    var NoneLocation = __dependency24__["default"];
+    var BucketCache = __dependency25__["default"];
 
-    var K = __dependency27__.K;
-    var EmberHandlebars = __dependency28__["default"];
+    var K = __dependency26__.K;
+    var EmberHandlebars = __dependency27__["default"];
 
     var ContainerDebugAdapter;
-    function props(obj) {
-      var properties = [];
-
-      for (var key in obj) {
-        properties.push(key);
-      }
-
-      return properties;
-    }
 
     /**
       An instance of `Ember.Application` is the starting point for every Ember
@@ -2432,7 +2329,7 @@ enifed("ember-application/system/application",
 
         this.scheduleInitialize();
 
-        Ember.libraries.registerCoreLibrary('Handlebars' + (EmberHandlebars.compile ? '' : '-runtime'), EmberHandlebars.VERSION);
+        Ember.libraries.registerCoreLibrary('Handlebars', EmberHandlebars.VERSION);
         Ember.libraries.registerCoreLibrary('jQuery', jQuery().jquery);
 
         if ( Ember.LOG_VERSION ) {
@@ -2822,15 +2719,14 @@ enifed("ember-application/system/application",
         @method runInitializers
       */
       runInitializers: function() {
-        var initializersByName = get(this.constructor, 'initializers');
-        var initializers = props(initializersByName);
+        var initializers = get(this.constructor, 'initializers');
         var container = this.__container__;
         var graph = new DAG();
         var namespace = this;
         var name, initializer;
 
-        for (var i = 0; i < initializers.length; i++) {
-          initializer = initializersByName[initializers[i]];
+        for (name in initializers) {
+          initializer = initializers[name];
           graph.addEdges(initializer.name, initializer.initialize, initializer.before, initializer.after);
         }
 
@@ -2944,7 +2840,7 @@ enifed("ember-application/system/application",
     });
 
     Application.reopenClass({
-      initializers: create(null),
+      initializers: {},
 
       /**
         Initializer receives an object which has the following attributes:
@@ -3110,9 +3006,9 @@ enifed("ember-application/system/application",
         var container = new Container();
 
         container.set = set;
-        container.resolver = resolverFor(namespace);
-        container.normalizeFullName = container.resolver.normalize;
-        container.describe = container.resolver.describe;
+        container.resolver  = resolverFor(namespace);
+        container.normalize = container.resolver.normalize;
+        container.describe  = container.resolver.describe;
         container.makeToString = container.resolver.makeToString;
 
         container.optionsForType('component', { singleton: false });
@@ -3125,9 +3021,6 @@ enifed("ember-application/system/application",
         container.register('controller:basic', Controller, { instantiate: false });
         container.register('controller:object', ObjectController, { instantiate: false });
         container.register('controller:array', ArrayController, { instantiate: false });
-
-        container.register('view:select', SelectView);
-
         container.register('route:basic', Route, { instantiate: false });
         container.register('event_dispatcher:main', EventDispatcher);
 
@@ -3216,7 +3109,7 @@ enifed("ember-application/system/application",
 
     __exports__["default"] = Application;
   });
-enifed("ember-application/system/dag",
+define("ember-application/system/dag",
   ["ember-metal/error","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -3259,22 +3152,7 @@ enifed("ember-application/system/dag",
      */
     function DAG() {
       this.names = [];
-      this.vertices = Object.create(null);
-    }
-
-    /**
-     * DAG Vertex
-     *
-     * @class Vertex
-     * @constructor
-     */
-
-    function Vertex(name) {
-      this.name = name;
-      this.incoming = {};
-      this.incomingNames = [];
-      this.hasOutgoing = false;
-      this.value = null;
+      this.vertices = {};
     }
 
     /**
@@ -3285,13 +3163,13 @@ enifed("ember-application/system/dag",
      * @param {String} name The name of the vertex to add
      */
     DAG.prototype.add = function(name) {
-      if (!name) {
-        throw new Error("Can't add Vertex without name");
-      }
-      if (this.vertices[name] !== undefined) {
+      if (!name) { return; }
+      if (this.vertices.hasOwnProperty(name)) {
         return this.vertices[name];
       }
-      var vertex = new Vertex(name);
+      var vertex = {
+        name: name, incoming: {}, incomingNames: [], hasOutgoing: false, value: null
+      };
       this.vertices[name] = vertex;
       this.names.push(name);
       return vertex;
@@ -3311,7 +3189,7 @@ enifed("ember-application/system/dag",
 
     /**
      * Connects the vertices with the given names, adding them to the graph if
-     * necessary, only if this does not produce is any circular dependency.
+     * necesary, only if this does not produce is any circular dependency.
      *
      * @private
      * @method addEdge
@@ -3322,8 +3200,7 @@ enifed("ember-application/system/dag",
       if (!fromName || !toName || fromName === toName) {
         return;
       }
-      var from = this.add(fromName);
-      var to = this.add(toName);
+      var from = this.add(fromName), to = this.add(toName);
       if (to.incoming.hasOwnProperty(fromName)) {
         return;
       }
@@ -3402,9 +3279,9 @@ enifed("ember-application/system/dag",
 
     __exports__["default"] = DAG;
   });
-enifed("ember-application/system/resolver",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/logger","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/system/namespace","ember-handlebars","ember-metal/dictionary","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+define("ember-application/system/resolver",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/logger","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/system/namespace","ember-handlebars","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -3509,7 +3386,6 @@ enifed("ember-application/system/resolver",
       @namespace Ember
       @extends Ember.Object
     */
-    var dictionary = __dependency8__["default"];
 
     __exports__["default"] = EmberObject.extend({
       /**
@@ -3520,28 +3396,21 @@ enifed("ember-application/system/resolver",
       */
       namespace: null,
 
-      init: function() {
-        this._parseNameCache = dictionary(null);
-      },
       normalize: function(fullName) {
-        var split = fullName.split(':', 2);
-        var type = split[0];
-        var name = split[1];
+        var split = fullName.split(':', 2),
+            type = split[0],
+            name = split[1];
 
         
         if (type !== 'template') {
           var result = name;
 
           if (result.indexOf('.') > -1) {
-            result = result.replace(/\.(.)/g, function(m) {
-              return m.charAt(1).toUpperCase();
-            });
+            result = result.replace(/\.(.)/g, function(m) { return m.charAt(1).toUpperCase(); });
           }
 
           if (name.indexOf('_') > -1) {
-            result = result.replace(/_(.)/g, function(m) {
-              return m.charAt(1).toUpperCase();
-            });
+            result = result.replace(/_(.)/g, function(m) { return m.charAt(1).toUpperCase(); });
           }
 
           return type + ':' + result;
@@ -3561,9 +3430,9 @@ enifed("ember-application/system/resolver",
         @return {Object} the resolved factory
       */
       resolve: function(fullName) {
-        var parsedName = this.parseName(fullName);
-        var resolveMethodName = parsedName.resolveMethodName;
-        var resolved;
+        var parsedName = this.parseName(fullName),
+            resolveMethodName = parsedName.resolveMethodName,
+            resolved;
 
         if (!(parsedName.name && parsedName.type)) {
           throw new TypeError('Invalid fullName: `' + fullName + '`, must be of the form `type:name` ');
@@ -3592,19 +3461,12 @@ enifed("ember-application/system/resolver",
         @param {String} fullName the lookup string
         @method parseName
       */
-
       parseName: function(fullName) {
-        return this._parseNameCache[fullName] || (
-          this._parseNameCache[fullName] = this._parseName(fullName)
-        );
-      },
-
-      _parseName: function(fullName) {
-        var nameParts = fullName.split(':');
-        var type = nameParts[0], fullNameWithoutType = nameParts[1];
-        var name = fullNameWithoutType;
-        var namespace = get(this, 'namespace');
-        var root = namespace;
+        var nameParts = fullName.split(':'),
+            type = nameParts[0], fullNameWithoutType = nameParts[1],
+            name = fullNameWithoutType,
+            namespace = get(this, 'namespace'),
+            root = namespace;
 
         if (type !== 'template' && name.indexOf('/') !== -1) {
           var parts = name.split('/');
@@ -3642,10 +3504,7 @@ enifed("ember-application/system/resolver",
         }
 
         var description = parsedName.root + '.' + classify(parsedName.name);
-
-        if (parsedName.type !== 'model') {
-          description += classify(parsedName.type);
-        }
+        if (parsedName.type !== 'model') { description += classify(parsedName.type); }
 
         return description;
       },
@@ -3688,7 +3547,6 @@ enifed("ember-application/system/resolver",
           return Ember.TEMPLATES[templateName];
         }
       },
-
       /**
         Lookup the view using `resolveOther`
 
@@ -3701,7 +3559,6 @@ enifed("ember-application/system/resolver",
         this.useRouterNaming(parsedName);
         return this.resolveOther(parsedName);
       },
-
       /**
         Lookup the controller using `resolveOther`
 
@@ -3790,7 +3647,7 @@ enifed("ember-application/system/resolver",
       }
     });
   });
-enifed("ember-extension-support",
+define("ember-extension-support",
   ["ember-metal/core","ember-extension-support/data_adapter","ember-extension-support/container_debug_adapter"],
   function(__dependency1__, __dependency2__, __dependency3__) {
     "use strict";
@@ -3809,7 +3666,7 @@ enifed("ember-extension-support",
     Ember.DataAdapter = DataAdapter;
     Ember.ContainerDebugAdapter = ContainerDebugAdapter;
   });
-enifed("ember-extension-support/container_debug_adapter",
+define("ember-extension-support/container_debug_adapter",
   ["ember-metal/core","ember-runtime/system/native_array","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/namespace","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -3886,7 +3743,7 @@ enifed("ember-extension-support/container_debug_adapter",
         classes in the resolver for a given type.
 
         @method canCatalogEntriesByType
-        @param {String} type The type. e.g. "model", "controller", "route"
+        @param {string} type The type. e.g. "model", "controller", "route"
         @return {boolean} whether a list is available for this type.
       */
       canCatalogEntriesByType: function(type) {
@@ -3898,7 +3755,7 @@ enifed("ember-extension-support/container_debug_adapter",
         Returns the available classes a given type.
 
         @method catalogEntriesByType
-        @param {String} type The type. e.g. "model", "controller", "route"
+        @param {string} type The type. e.g. "model", "controller", "route"
         @return {Array} An array of strings.
       */
       catalogEntriesByType: function(type) {
@@ -3922,7 +3779,7 @@ enifed("ember-extension-support/container_debug_adapter",
       }
     });
   });
-enifed("ember-extension-support/data_adapter",
+define("ember-extension-support/data_adapter",
   ["ember-metal/core","ember-metal/property_get","ember-metal/run_loop","ember-runtime/system/string","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/native_array","ember-application/system/application","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -4060,10 +3917,8 @@ enifed("ember-extension-support/data_adapter",
         @return {Function} Method to call to remove all observers
       */
       watchModelTypes: function(typesAdded, typesUpdated) {
-        var modelTypes = this.getModelTypes();
-        var self = this;
-        var releaseMethods = emberA();
-        var typesToSend;
+        var modelTypes = this.getModelTypes(),
+            self = this, typesToSend, releaseMethods = emberA();
 
         typesToSend = modelTypes.map(function(type) {
           var klass = type.klass;
@@ -4204,8 +4059,7 @@ enifed("ember-extension-support/data_adapter",
       */
 
       observeModelType: function(type, typesUpdated) {
-        var self = this;
-        var records = this.getRecords(type);
+        var self = this, records = this.getRecords(type);
 
         var onChange = function() {
           typesUpdated([self.wrapModelType(type)]);
@@ -4245,9 +4099,8 @@ enifed("ember-extension-support/data_adapter",
           release: {Function} The function to remove observers
       */
       wrapModelType: function(type, name) {
-        var records = this.getRecords(type);
-        var self = this;
-        var release, typeToSend;
+        var release, records = this.getRecords(type),
+            typeToSend, self = this;
 
         typeToSend = {
           name: name || type.toString(),
@@ -4269,9 +4122,8 @@ enifed("ember-extension-support/data_adapter",
         @return {Array} Array of model types
       */
       getModelTypes: function() {
-        var self = this;
-        var containerDebugAdapter = this.get('containerDebugAdapter');
-        var types;
+        var types, self = this,
+            containerDebugAdapter = this.get('containerDebugAdapter');
 
         if (containerDebugAdapter.canCatalogEntriesByType('model')) {
           types = containerDebugAdapter.catalogEntriesByType('model');
@@ -4302,9 +4154,9 @@ enifed("ember-extension-support/data_adapter",
         @return {Array} Array of model type strings
       */
       _getObjectsOnNamespaces: function() {
-        var namespaces = emberA(Namespace.NAMESPACES);
-        var types = emberA();
-        var self = this;
+        var namespaces = emberA(Namespace.NAMESPACES),
+            types = emberA(),
+            self = this;
 
         namespaces.forEach(function(namespace) {
           for (var key in namespace) {
@@ -4347,9 +4199,7 @@ enifed("ember-extension-support/data_adapter",
         searchKeywords: {Array}
       */
       wrapRecord: function(record) {
-        var recordToSend = { object: record };
-        var columnValues = {};
-        var self = this;
+        var recordToSend = { object: record }, columnValues = {}, self = this;
 
         recordToSend.columnValues = this.getRecordColumnValues(record);
         recordToSend.searchKeywords = this.getRecordKeywords(record);
@@ -4422,21 +4272,17 @@ enifed("ember-extension-support/data_adapter",
       }
     });
   });
-enifed("ember-extension-support/initializers",
+define("ember-extension-support/initializers",
   [],
   function() {
     "use strict";
 
   });
-enifed("ember-handlebars-compiler",
+define("ember-handlebars-compiler",
   ["ember-metal/core","exports"],
   function(__dependency1__, __exports__) {
-        /* global Handlebars:true */
-
-    // Remove "use strict"; from transpiled module (in browser builds only) until
-    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
-    //
-    // REMOVE_USE_STRICT: true
+    "use strict";
+    /* global Handlebars:true */
 
     /**
     @module ember
@@ -4461,8 +4307,8 @@ enifed("ember-handlebars-compiler",
     // ES6Todo: when ember-debug is es6'ed import this.
     // var emberAssert = Ember.assert;
     var Handlebars = (Ember.imports && Ember.imports.Handlebars) || (this && this.Handlebars);
-    if (!Handlebars && typeof eriuqer === 'function') {
-      Handlebars = eriuqer('handlebars');
+    if (!Handlebars && typeof require === 'function') {
+      Handlebars = require('handlebars');
     }
 
     
@@ -4524,7 +4370,7 @@ enifed("ember-handlebars-compiler",
       Which is functionally equivalent to:
 
       ```handlebars
-      {{view 'calendar'}}
+      {{view App.CalendarView}}
       ```
 
       Options in the helper will be passed to the view in exactly the same
@@ -4635,14 +4481,14 @@ enifed("ember-handlebars-compiler",
     // This can go away once the following is closed:
     // https://github.com/wycats/handlebars.js/issues/634
 
-    var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/;
-    var BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/;
-    var INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
+    var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/,
+        BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/,
+        INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
 
     EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation = function(source) {
-      var helperInvocation = source[source.length - 1];
-      var helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1];
-      var matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);
+      var helperInvocation = source[source.length - 1],
+          helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1],
+          matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);
 
       source[source.length - 1] = matches[1] + "'" + helperName + "'" + matches[3];
     };
@@ -4695,12 +4541,12 @@ enifed("ember-handlebars-compiler",
       @method precompile
       @for Ember.Handlebars
       @static
-      @param {String|Object} value The template to precompile or an Handlebars AST
+      @param {String} string The template to precompile
       @param {Boolean} asObject optional parameter, defaulting to true, of whether or not the
                                 compiled template should be returned as an Object or a String
     */
-    EmberHandlebars.precompile = function(value, asObject) {
-      var ast = Handlebars.parse(value);
+    EmberHandlebars.precompile = function(string, asObject) {
+      var ast = Handlebars.parse(string);
 
       var options = {
         knownHelpers: {
@@ -4749,7 +4595,7 @@ enifed("ember-handlebars-compiler",
 
     __exports__["default"] = EmberHandlebars;
   });
-enifed("ember-handlebars",
+define("ember-handlebars",
   ["ember-handlebars-compiler","ember-metal/core","ember-runtime/system/lazy_load","ember-handlebars/loader","ember-handlebars/ext","ember-handlebars/string","ember-handlebars/helpers/shared","ember-handlebars/helpers/binding","ember-handlebars/helpers/collection","ember-handlebars/helpers/view","ember-handlebars/helpers/unbound","ember-handlebars/helpers/debug","ember-handlebars/helpers/each","ember-handlebars/helpers/template","ember-handlebars/helpers/partial","ember-handlebars/helpers/yield","ember-handlebars/helpers/loc","ember-handlebars/controls/checkbox","ember-handlebars/controls/select","ember-handlebars/controls/text_area","ember-handlebars/controls/text_field","ember-handlebars/controls/text_support","ember-handlebars/controls","ember-handlebars/component_lookup","ember-handlebars/views/handlebars_bound_view","ember-handlebars/views/metamorph_view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __exports__) {
     "use strict";
@@ -4900,7 +4746,7 @@ enifed("ember-handlebars",
 
     __exports__["default"] = EmberHandlebars;
   });
-enifed("ember-handlebars/component_lookup",
+define("ember-handlebars/component_lookup",
   ["ember-runtime/system/object","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -4911,9 +4757,9 @@ enifed("ember-handlebars/component_lookup",
 
         container = container || this.container;
 
-        var fullName = 'component:' + name;
-        var templateFullName = 'template:components/' + name;
-        var templateRegistered = container && container.has(templateFullName);
+        var fullName = 'component:' + name,
+            templateFullName = 'template:components/' + name,
+            templateRegistered = container && container.has(templateFullName);
 
         if (templateRegistered) {
           container.injection(fullName, 'layout', templateFullName);
@@ -4935,7 +4781,7 @@ enifed("ember-handlebars/component_lookup",
 
     __exports__["default"] = ComponentLookup;
   });
-enifed("ember-handlebars/controls",
+define("ember-handlebars/controls",
   ["ember-handlebars/controls/checkbox","ember-handlebars/controls/text_field","ember-handlebars/controls/text_area","ember-metal/core","ember-handlebars-compiler","ember-handlebars/ext","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -5026,7 +4872,7 @@ enifed("ember-handlebars/controls",
 
       The helper can send multiple actions based on user events.
 
-      The action property defines the action which is sent when
+      The action property defines the action which is send when
       the user presses the return key.
 
       ```handlebars
@@ -5042,7 +4888,6 @@ enifed("ember-handlebars/controls",
     * `focus-out`
     * `key-press`
 
-
       For example, if you desire an action to be sent when the input is blurred,
       you only need to setup the action name to the event name property.
 
@@ -5141,10 +4986,10 @@ enifed("ember-handlebars/controls",
     */
     function inputHelper(options) {
       
-      var hash = options.hash;
-      var types = options.hashTypes;
-      var inputType = _resolveOption(this, options, 'type');
-      var onEvent = hash.on;
+      var hash = options.hash,
+          types = options.hashTypes,
+          inputType = _resolveOption(this, options, 'type'),
+          onEvent = hash.on;
 
       if (inputType === 'checkbox') {
         delete hash.type;
@@ -5323,7 +5168,7 @@ enifed("ember-handlebars/controls",
       Internally, `{{textarea}}` creates an instance of `Ember.TextArea`, passing
       arguments from the helper to `Ember.TextArea`'s `create` method. You can
       extend the capabilities of text areas in your application by reopening this
-      class. For example, if you are building a Bootstrap project where `data-*`
+      class. For example, if you are building a Bootstrap project where `data-*` 
       attributes are used, you can globally add support for a `data-*` attribute
       on all `{{textarea}}`s' in your app by reopening `Ember.TextArea` or
       `Ember.TextSupport` and adding it to the `attributeBindings` concatenated
@@ -5347,15 +5192,15 @@ enifed("ember-handlebars/controls",
     */
     function textareaHelper(options) {
       
-      var hash = options.hash;
-      var types = options.hashTypes;
+      var hash = options.hash,
+          types = options.hashTypes;
 
       return helpers.view.call(this, TextArea, options);
     }
 
     __exports__.textareaHelper = textareaHelper;
   });
-enifed("ember-handlebars/controls/checkbox",
+define("ember-handlebars/controls/checkbox",
   ["ember-metal/property_get","ember-metal/property_set","ember-views/views/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -5431,7 +5276,7 @@ enifed("ember-handlebars/controls/checkbox",
       }
     });
   });
-enifed("ember-handlebars/controls/select",
+define("ember-handlebars/controls/select",
   ["ember-handlebars-compiler","ember-metal/enumerable_utils","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/collection_view","ember-metal/utils","ember-metal/is_none","ember-metal/computed","ember-runtime/system/native_array","ember-metal/mixin","ember-metal/properties","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
@@ -5479,8 +5324,8 @@ enifed("ember-handlebars/controls/select",
       },
 
       selected: computed(function() {
-        var content = get(this, 'content');
-        var selection = get(this, 'parentView.selection');
+        var content = get(this, 'content'),
+            selection = get(this, 'parentView.selection');
         if (get(this, 'parentView.multiple')) {
           return selection && indexOf(selection, content.valueOf()) > -1;
         } else {
@@ -5550,7 +5395,7 @@ enifed("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view "select" content=names}}
+      {{view Ember.Select content=names}}
       ```
 
       Would result in the following HTML:
@@ -5573,7 +5418,10 @@ enifed("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view "select" content=names value=selectedName}}
+      {{view Ember.Select
+             content=names
+             value=selectedName
+      }}
       ```
 
       Would result in the following HTML with the `<option>` for 'Tom' selected:
@@ -5612,7 +5460,7 @@ enifed("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view "select"
+      {{view Ember.Select
              content=programmers
              optionValuePath="content.id"
              optionLabelPath="content.firstName"}}
@@ -5643,7 +5491,7 @@ enifed("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view "select"
+      {{view Ember.Select
              content=programmers
              optionValuePath="content.id"
              optionLabelPath="content.firstName"
@@ -5676,12 +5524,15 @@ enifed("ember-handlebars/controls/select",
 
       App.ApplicationController = Ember.ObjectController.extend({
         selectedPerson: tom,
-        programmers: [ yehuda, tom ]
+        programmers: [
+          yehuda,
+          tom
+        ]
       });
       ```
 
       ```handlebars
-      {{view "select"
+      {{view Ember.Select
              content=programmers
              optionValuePath="content.id"
              optionLabelPath="content.firstName"
@@ -5710,12 +5561,15 @@ enifed("ember-handlebars/controls/select",
       ```javascript
       App.ApplicationController = Ember.ObjectController.extend({
         selectedProgrammer: null,
-        programmers: ["Yehuda", "Tom"]
+        programmers: [
+          "Yehuda",
+          "Tom"
+        ]
       });
       ```
 
       ``` handlebars
-      {{view "select"
+      {{view Ember.Select
              content=programmers
              value=selectedProgrammer
       }}
@@ -5739,12 +5593,15 @@ enifed("ember-handlebars/controls/select",
       ```javascript
       App.ApplicationController = Ember.ObjectController.extend({
         selectedProgrammer: null,
-        programmers: [ "Yehuda", "Tom" ]
+        programmers: [
+          "Yehuda",
+          "Tom"
+        ]
       });
       ```
 
       ```handlebars
-      {{view "select"
+      {{view Ember.Select
              content=programmers
              value=selectedProgrammer
              prompt="Please select a name"
@@ -5866,8 +5723,7 @@ enifed("ember-handlebars/controls/select",
         Otherwise, this should be a list of objects. For instance:
 
         ```javascript
-        var App = Ember.Application.create();
-        var App.MySelect = Ember.Select.extend({
+        Ember.Select.create({
           content: Ember.A([
               { id: 1, firstName: 'Yehuda' },
               { id: 2, firstName: 'Tom' }
@@ -6010,11 +5866,11 @@ enifed("ember-handlebars/controls/select",
       }),
 
       valueDidChange: observer('value', function() {
-        var content = get(this, 'content');
-        var value = get(this, 'value');
-        var valuePath = get(this, 'optionValuePath').replace(/^content\.?/, '');
-        var selectedValue = (valuePath ? get(this, 'selection.' + valuePath) : get(this, 'selection'));
-        var selection;
+        var content = get(this, 'content'),
+            value = get(this, 'value'),
+            valuePath = get(this, 'optionValuePath').replace(/^content\.?/, ''),
+            selectedValue = (valuePath ? get(this, 'selection.' + valuePath) : get(this, 'selection')),
+            selection;
 
         if (value !== selectedValue) {
           selection = content ? content.find(function(obj) {
@@ -6037,9 +5893,9 @@ enifed("ember-handlebars/controls/select",
       },
 
       _changeSingle: function() {
-        var selectedIndex = this.$()[0].selectedIndex;
-        var content = get(this, 'content');
-        var prompt = get(this, 'prompt');
+        var selectedIndex = this.$()[0].selectedIndex,
+            content = get(this, 'content'),
+            prompt = get(this, 'prompt');
 
         if (!content || !get(content, 'length')) { return; }
         if (prompt && selectedIndex === 0) { set(this, 'selection', null); return; }
@@ -6050,11 +5906,11 @@ enifed("ember-handlebars/controls/select",
 
 
       _changeMultiple: function() {
-        var options = this.$('option:selected');
-        var prompt = get(this, 'prompt');
-        var offset = prompt ? 1 : 0;
-        var content = get(this, 'content');
-        var selection = get(this, 'selection');
+        var options = this.$('option:selected'),
+            prompt = get(this, 'prompt'),
+            offset = prompt ? 1 : 0,
+            content = get(this, 'content'),
+            selection = get(this, 'selection');
 
         if (!content) { return; }
         if (options) {
@@ -6075,23 +5931,23 @@ enifed("ember-handlebars/controls/select",
         var el = this.get('element');
         if (!el) { return; }
 
-        var content = get(this, 'content');
-        var selection = get(this, 'selection');
-        var selectionIndex = content ? indexOf(content, selection) : -1;
-        var prompt = get(this, 'prompt');
+        var content = get(this, 'content'),
+            selection = get(this, 'selection'),
+            selectionIndex = content ? indexOf(content, selection) : -1,
+            prompt = get(this, 'prompt');
 
         if (prompt) { selectionIndex += 1; }
         if (el) { el.selectedIndex = selectionIndex; }
       },
 
       _selectionDidChangeMultiple: function() {
-        var content = get(this, 'content');
-        var selection = get(this, 'selection');
-        var selectedIndexes = content ? indexesOf(content, selection) : [-1];
-        var prompt = get(this, 'prompt');
-        var offset = prompt ? 1 : 0;
-        var options = this.$('option');
-        var adjusted;
+        var content = get(this, 'content'),
+            selection = get(this, 'selection'),
+            selectedIndexes = content ? indexesOf(content, selection) : [-1],
+            prompt = get(this, 'prompt'),
+            offset = prompt ? 1 : 0,
+            options = this.$('option'),
+            adjusted;
 
         if (options) {
           options.each(function() {
@@ -6113,7 +5969,7 @@ enifed("ember-handlebars/controls/select",
     __exports__.SelectOption = SelectOption;
     __exports__.SelectOptgroup = SelectOptgroup;
   });
-enifed("ember-handlebars/controls/text_area",
+define("ember-handlebars/controls/text_area",
   ["ember-metal/property_get","ember-views/views/component","ember-handlebars/controls/text_support","ember-metal/mixin","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -6150,14 +6006,14 @@ enifed("ember-handlebars/controls/text_area",
       classNames: ['ember-text-area'],
 
       tagName: "textarea",
-      attributeBindings: ['rows', 'cols', 'name', 'selectionEnd', 'selectionStart', 'wrap', 'lang', 'dir'],
+      attributeBindings: ['rows', 'cols', 'name', 'selectionEnd', 'selectionStart', 'wrap'],
       rows: null,
       cols: null,
 
       _updateElementValue: observer('value', function() {
         // We do this check so cursor position doesn't get affected in IE
-        var value = get(this, 'value');
-        var $el = this.$();
+        var value = get(this, 'value'),
+            $el = this.$();
         if ($el && value !== $el.val()) {
           $el.val(value);
         }
@@ -6169,7 +6025,7 @@ enifed("ember-handlebars/controls/text_area",
       }
     });
   });
-enifed("ember-handlebars/controls/text_field",
+define("ember-handlebars/controls/text_field",
   ["ember-metal/property_get","ember-metal/property_set","ember-views/views/component","ember-handlebars/controls/text_support","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -6209,7 +6065,7 @@ enifed("ember-handlebars/controls/text_field",
       attributeBindings: ['type', 'value', 'size', 'pattern', 'name', 'min', 'max',
                           'accept', 'autocomplete', 'autosave', 'formaction',
                           'formenctype', 'formmethod', 'formnovalidate', 'formtarget',
-                          'height', 'inputmode', 'list', 'multiple', 'step', 'lang', 'dir',
+                          'height', 'inputmode', 'list', 'multiple', 'step',
                           'width'],
 
       /**
@@ -6270,7 +6126,7 @@ enifed("ember-handlebars/controls/text_field",
       max: null
     });
   });
-enifed("ember-handlebars/controls/text_support",
+define("ember-handlebars/controls/text_support",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-runtime/mixins/target_action_support","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -6341,7 +6197,7 @@ enifed("ember-handlebars/controls/text_support",
       onEvent: 'enter',
 
       /**
-        Whether the `keyUp` event that triggers an `action` to be sent continues
+        Whether they `keyUp` event that triggers an `action` to be sent continues
         propagating to other views.
 
         By default, when the user presses the return key on their keyboard and
@@ -6409,7 +6265,7 @@ enifed("ember-handlebars/controls/text_support",
       },
 
       /**
-        Called when the text area is blurred.
+        Called when the text area is blurred. 
 
         Uses sendAction to send the `focus-out` action.
 
@@ -6444,9 +6300,9 @@ enifed("ember-handlebars/controls/text_support",
     // sendAction semantics for TextField are different from
     // the component semantics so this method normalizes them.
     function sendAction(eventName, view, event) {
-      var action = get(view, eventName);
-      var on = get(view, 'onEvent');
-      var value = get(view, 'value');
+      var action = get(view, eventName),
+          on = get(view, 'onEvent'),
+          value = get(view, 'value');
 
       // back-compat support for keyPress as an event name even though
       // it's also a method name that consumes the event (and therefore
@@ -6466,9 +6322,9 @@ enifed("ember-handlebars/controls/text_support",
 
     __exports__["default"] = TextSupport;
   });
-enifed("ember-handlebars/ext",
-  ["ember-metal/core","ember-runtime/system/string","ember-handlebars-compiler","ember-metal/property_get","ember-metal/error","ember-metal/mixin","ember-views/views/view","ember-handlebars/views/metamorph_view","ember-metal/path_cache","ember-metal/is_empty","ember-metal/cache","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+define("ember-handlebars/ext",
+  ["ember-metal/core","ember-runtime/system/string","ember-handlebars-compiler","ember-metal/property_get","ember-metal/binding","ember-metal/error","ember-metal/mixin","ember-metal/is_empty","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.FEATURES, Ember.assert, Ember.Handlebars, Ember.lookup
@@ -6480,20 +6336,17 @@ enifed("ember-handlebars/ext",
     var helpers = EmberHandlebars.helpers;
 
     var get = __dependency4__.get;
-    var EmberError = __dependency5__["default"];
-    var IS_BINDING = __dependency6__.IS_BINDING;
-
-    var View = __dependency7__["default"];
-    var _Metamorph = __dependency8__._Metamorph;
-    var detectIsGlobal = __dependency9__.isGlobal;
+    var isGlobalPath = __dependency5__.isGlobalPath;
+    var EmberError = __dependency6__["default"];
+    var IS_BINDING = __dependency7__.IS_BINDING;
 
     // late bound via requireModule because of circular dependencies.
-    var resolveHelper, SimpleHandlebarsView;
+    var resolveHelper,
+        SimpleHandlebarsView;
 
-    var isEmpty = __dependency10__["default"];
+    var isEmpty = __dependency8__["default"];
 
-    var slice = [].slice;
-    var originalTemplate = EmberHandlebars.template;
+    var slice = [].slice, originalTemplate = EmberHandlebars.template;
 
     /**
       If a path starts with a reserved keyword, returns the root
@@ -6506,20 +6359,13 @@ enifed("ember-handlebars/ext",
       @param path {String}
       @param data {Hash}
     */
-
-    var Cache = __dependency11__["default"];
-
-    var FIRST_SEGMENT_CACHE = new Cache(1000, function(path){
-      return path.split('.', 1)[0];
-    });
-
     function normalizePath(root, path, data) {
-      var keywords = (data && data.keywords) || {};
-      var keyword, isKeyword;
+      var keywords = (data && data.keywords) || {},
+          keyword, isKeyword;
 
       // Get the first segment of the path. For example, if the
       // path is "foo.bar.baz", returns "foo".
-      keyword = FIRST_SEGMENT_CACHE.get(path);
+      keyword = path.split('.', 1)[0];
 
       // Test to see if the first path is a keyword that has been
       // passed along in the view's data hash. If so, we will treat
@@ -6540,11 +6386,7 @@ enifed("ember-handlebars/ext",
         }
       }
 
-      return {
-        root: root,
-        path: path,
-        isKeyword: isKeyword
-      };
+      return { root: root, path: path, isKeyword: isKeyword };
     }
 
 
@@ -6560,125 +6402,22 @@ enifed("ember-handlebars/ext",
       @param {Object} options The template's option hash
     */
     function handlebarsGet(root, path, options) {
-      var data = options && options.data;
-      var normalizedPath = normalizePath(root, path, data);
-      var value;
-
-      // In cases where the path begins with a keyword, change the
-      // root to the value represented by that keyword, and ensure
-      // the path is relative to it.
-      root = normalizedPath.root;
-      path = normalizedPath.path;
-
-      // Ember.get with a null root and GlobalPath will fall back to
-      // Ember.lookup, which is no longer allowed in templates.
-      //
-      // But when outputting a primitive, root will be the primitive
-      // and path a blank string. These primitives should pass through
-      // to `get`.
-      if (root || path === '') {
-        value = get(root, path);
-      }
-
-      if (detectIsGlobal(path)) {
-        if (value === undefined && root !== Ember.lookup) {
-          root = Ember.lookup;
-          value = get(root, path);
-        }
-        if (root === Ember.lookup || root === null) {
-                  }
-      }
-
-      return value;
-    }
-
-    function lookupViewInContainer(container, path) {
-            return container.lookupFactory('view:'+path);
-    }
-
-    function lookupViewByClassName(path) {
-      var viewClass;
-      if (detectIsGlobal(path)) {
-        viewClass = get(path);
-                return viewClass;
-      }
-    }
-
-    /**
-      handlebarsGetView resolves a view based on strings passed into a template.
-      For example:
-
-      ```handlebars
-      {{view "some-view"}}
-      {{view view.someView}}
-      {{view App.SomeView}} {{! deprecated }}
-      ```
-
-      A value is first checked to be a string- non-strings are presumed to be
-      an object and returned. This handles the "access a view on a context"
-      case (line 2 in the above examples).
-
-      Next a string is normalized, then called on the context with `get`. If
-      there is still no value, a GlobalPath will be fetched from the global
-      context (raising a deprecation) and a localPath will be passed to the
-      container to be looked up.
-
-      @private
-      @for Ember.Handlebars
-      @param {Object} context The context of the template being rendered
-      @param {String} path The path to be lookedup
-      @param {Object} container The container
-      @param {Object} options The options from the template
-    */
-    function handlebarsGetView(context, path, container, options) {
-      var viewClass;
-      var data;
-      var pathType;
-      if (options) {
-        data      = options.data;
-        pathType  = options.types && options.types[0];
-      }
-
-      if ('string' === typeof path) {
-        if('STRING' === pathType && container) {
-          viewClass = lookupViewInContainer(container, path);
-          
-        }
-
-        if(!viewClass) {
-          viewClass = lookupViewByClassName(path);
-        }
-
-        if(!viewClass) {
-          if (data) {
-            var normalizedPath = normalizePath(context, path, data);
-            context = normalizedPath.root;
-            path = normalizedPath.path;
-          }
-
-          // Only lookup view class on context if there is a context. If not,
-          // the global lookup path on get may kick in.
-          viewClass = context && get(context, path);
-
-          if(!viewClass) {
-            // try the container once more with the normalized path
-            viewClass = lookupViewInContainer(container, path);
-          }
-        }
-      } else {
-        viewClass = path;
-      }
-
-      // Sometimes a view's value is yet another path
-      if ('string' === typeof viewClass && data && data.view) {
-        viewClass = handlebarsGetView(data.view, viewClass, container, {
-          data: data,
-          types: ['ID']
-        });
-      }
+      var data = options && options.data,
+          normalizedPath = normalizePath(root, path, data),
+          value;
 
       
-      return viewClass;
+        root = normalizedPath.root;
+        path = normalizedPath.path;
+
+        value = get(root, path);
+
+        if (value === undefined && root !== Ember.lookup && isGlobalPath(path)) {
+          value = get(Ember.lookup, path);
+        }
+      
+
+      return value;
     }
 
     /**
@@ -6917,8 +6656,8 @@ enifed("ember-handlebars/ext",
       @param {String} dependentKeys*
     */
     function registerBoundHelper(name, fn) {
-      var boundHelperArgs = slice.call(arguments, 1);
-      var boundFn = makeBoundHelper.apply(this, boundHelperArgs);
+      var boundHelperArgs = slice.call(arguments, 1),
+          boundFn = makeBoundHelper.apply(this, boundHelperArgs);
       EmberHandlebars.registerHelper(name, boundFn);
     }
 
@@ -6953,21 +6692,21 @@ enifed("ember-handlebars/ext",
       var dependentKeys = slice.call(arguments, 1);
 
       function helper() {
-        var properties = slice.call(arguments, 0, -1);
-        var numProperties = properties.length;
-        var options = arguments[arguments.length - 1];
-        var normalizedProperties = [];
-        var data = options.data;
-        var types = data.isUnbound ? slice.call(options.types, 1) : options.types;
-        var hash = options.hash;
+        var properties = slice.call(arguments, 0, -1),
+          numProperties = properties.length,
+          options = arguments[arguments.length - 1],
+          normalizedProperties = [],
+          data = options.data,
+          types = data.isUnbound ? slice.call(options.types, 1) : options.types,
+          hash = options.hash,
+          view = data.view,
+          contexts = options.contexts,
+          currentContext = (contexts && contexts.length) ? contexts[0] : this,
+          prefixPathForDependentKeys = '',
+          loc, len, hashOption,
+          boundOption, property,
+          normalizedValue = SimpleHandlebarsView.prototype.normalizedValue;
         var hashTypes = options.hashTypes;
-        var view = data.view;
-        var contexts = options.contexts;
-        var currentContext = (contexts && contexts.length) ? contexts[0] : this;
-        var prefixPathForDependentKeys = '';
-        var loc, len, hashOption;
-        var boundOption, property;
-        var normalizedValue = SimpleHandlebarsView.prototype.normalizedValue;
 
         
         // Detect bound options (e.g. countBinding="otherCount")
@@ -6991,7 +6730,7 @@ enifed("ember-handlebars/ext",
             normalizedProperties.push(normalizedProp);
             watchedProperties.push(normalizedProp);
           } else {
-            if (data.isUnbound) {
+            if(data.isUnbound) {
               normalizedProperties.push({path: properties[loc]});
             }else {
               normalizedProperties.push(null);
@@ -7009,8 +6748,7 @@ enifed("ember-handlebars/ext",
 
         // Override SimpleHandlebarsView's method for generating the view's content.
         bindView.normalizedValue = function() {
-          var args = [];
-          var boundOption;
+          var args = [], boundOption;
 
           // Copy over bound hash options.
           for (boundOption in boundOptions) {
@@ -7057,9 +6795,9 @@ enifed("ember-handlebars/ext",
         }
 
         // Add dependent key observers to the first param
-        var normalized = normalizedProperties[0];
-        var pathRoot = normalized.root;
-        var path = normalized.path;
+        var normalized = normalizedProperties[0],
+            pathRoot = normalized.root,
+            path = normalized.path;
 
         if(!isEmpty(path)) {
           prefixPathForDependentKeys = path + '.';
@@ -7084,21 +6822,25 @@ enifed("ember-handlebars/ext",
       @param {String} options
     */
     function evaluateUnboundHelper(context, fn, normalizedProperties, options) {
-      var args = [];
-      var hash = options.hash;
-      var boundOptions = hash.boundOptions;
-      var types = slice.call(options.types, 1);
-      var loc, len, property, propertyType, boundOption;
+      var args = [],
+       hash = options.hash,
+       boundOptions = hash.boundOptions,
+       types = slice.call(options.types, 1),
+       loc,
+       len,
+       property,
+       propertyType,
+       boundOption;
 
       for (boundOption in boundOptions) {
         if (!boundOptions.hasOwnProperty(boundOption)) { continue; }
         hash[boundOption] = handlebarsGet(context, boundOptions[boundOption], options);
       }
 
-      for (loc = 0, len = normalizedProperties.length; loc < len; ++loc) {
+      for(loc = 0, len = normalizedProperties.length; loc < len; ++loc) {
         property = normalizedProperties[loc];
         propertyType = types[loc];
-        if (propertyType === "ID") {
+        if(propertyType === "ID") {
           args.push(handlebarsGet(property.root, property.path, options));
         } else {
           args.push(property.path);
@@ -7126,12 +6868,11 @@ enifed("ember-handlebars/ext",
     __exports__.template = template;__exports__.normalizePath = normalizePath;
     __exports__.makeBoundHelper = makeBoundHelper;
     __exports__.handlebarsGet = handlebarsGet;
-    __exports__.handlebarsGetView = handlebarsGetView;
     __exports__.evaluateUnboundHelper = evaluateUnboundHelper;
   });
-enifed("ember-handlebars/helpers/binding",
-  ["ember-metal/core","ember-handlebars-compiler","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/string","ember-metal/platform","ember-metal/is_none","ember-metal/enumerable_utils","ember-metal/array","ember-views/views/view","ember-metal/run_loop","ember-metal/observer","ember-metal/binding","ember-views/system/jquery","ember-handlebars/ext","ember-metal/keys","ember-metal/cache","ember-handlebars/views/handlebars_bound_view","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __exports__) {
+define("ember-handlebars/helpers/binding",
+  ["ember-metal/core","ember-handlebars-compiler","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/string","ember-metal/platform","ember-metal/is_none","ember-metal/enumerable_utils","ember-metal/array","ember-views/views/view","ember-metal/run_loop","ember-metal/observer","ember-metal/binding","ember-views/system/jquery","ember-handlebars/ext","ember-runtime/keys","ember-handlebars/views/handlebars_bound_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -7161,10 +6902,9 @@ enifed("ember-handlebars/helpers/binding",
     var isArray = __dependency5__.isArray;
     var handlebarsGetEscaped = __dependency16__.getEscaped;
     var keys = __dependency17__["default"];
-    var Cache = __dependency18__["default"];
 
-    var _HandlebarsBoundView = __dependency19__._HandlebarsBoundView;
-    var SimpleHandlebarsView = __dependency19__.SimpleHandlebarsView;
+    var _HandlebarsBoundView = __dependency18__._HandlebarsBoundView;
+    var SimpleHandlebarsView = __dependency18__.SimpleHandlebarsView;
 
     var normalizePath = __dependency16__.normalizePath;
     var handlebarsGet = __dependency16__.handlebarsGet;
@@ -7233,11 +6973,11 @@ enifed("ember-handlebars/helpers/binding",
     // Binds a property into the DOM. This will create a hook in DOM that the
     // KVO system will look for and update if the property changes.
     function bind(property, options, preserveContext, shouldDisplay, valueNormalizer, childProperties) {
-      var data = options.data;
-      var fn = options.fn;
-      var inverse = options.inverse;
-      var view = data.view;
-      var normalized, observer, i;
+      var data = options.data,
+          fn = options.fn,
+          inverse = options.inverse,
+          view = data.view,
+          normalized, observer, i;
 
       // we relied on the behavior of calling without
       // context to mean this === window, but when running
@@ -7246,78 +6986,84 @@ enifed("ember-handlebars/helpers/binding",
 
       normalized = normalizePath(currentContext, property, data);
 
-      if (data.insideGroup) {
-        observer = function() {
-          while (view._contextView) {
-            view = view._contextView;
+      // Set up observers for observable objects
+      if ('object' === typeof this) {
+        if (data.insideGroup) {
+          observer = function() {
+            while (view._contextView) {
+              view = view._contextView;
+            }
+            run.once(view, 'rerender');
+          };
+
+          var template, context, result = handlebarsGet(currentContext, property, options);
+
+          result = valueNormalizer ? valueNormalizer(result) : result;
+
+          context = preserveContext ? currentContext : result;
+          if (shouldDisplay(result)) {
+            template = fn;
+          } else if (inverse) {
+            template = inverse;
           }
-          run.once(view, 'rerender');
-        };
 
-        var template, context;
-        var result = handlebarsGet(currentContext, property, options);
+          template(context, { data: options.data });
+        } else {
+          var viewClass = _HandlebarsBoundView;
+          var viewOptions = {
+            preserveContext: preserveContext,
+            shouldDisplayFunc: shouldDisplay,
+            valueNormalizerFunc: valueNormalizer,
+            displayTemplate: fn,
+            inverseTemplate: inverse,
+            path: property,
+            pathRoot: currentContext,
+            previousContext: currentContext,
+            isEscaped: !options.hash.unescaped,
+            templateData: options.data,
+            templateHash: options.hash,
+            helperName: options.helperName
+          };
 
-        result = valueNormalizer ? valueNormalizer(result) : result;
+          if (options.isWithHelper) {
+            viewClass = WithView;
+          }
 
-        context = preserveContext ? currentContext : result;
-        if (shouldDisplay(result)) {
-          template = fn;
-        } else if (inverse) {
-          template = inverse;
+          // Create the view that will wrap the output of this template/property
+          // and add it to the nearest view's childViews array.
+          // See the documentation of Ember._HandlebarsBoundView for more.
+          var bindView = view.createChildView(viewClass, viewOptions);
+
+          view.appendChild(bindView);
+
+          observer = function() {
+            run.scheduleOnce('render', bindView, 'rerenderIfNeeded');
+          };
         }
 
-        template(context, { data: options.data });
+        // Observes the given property on the context and
+        // tells the Ember._HandlebarsBoundView to re-render. If property
+        // is an empty string, we are printing the current context
+        // object ({{this}}) so updating it is not our responsibility.
+        if (normalized.path !== '') {
+          view.registerObserver(normalized.root, normalized.path, observer);
+          if (childProperties) {
+            for (i=0; i<childProperties.length; i++) {
+              view.registerObserver(normalized.root, normalized.path+'.'+childProperties[i], observer);
+            }
+          }
+        }
       } else {
-        var viewClass = _HandlebarsBoundView;
-        var viewOptions = {
-          preserveContext: preserveContext,
-          shouldDisplayFunc: shouldDisplay,
-          valueNormalizerFunc: valueNormalizer,
-          displayTemplate: fn,
-          inverseTemplate: inverse,
-          path: property,
-          pathRoot: currentContext,
-          previousContext: currentContext,
-          isEscaped: !options.hash.unescaped,
-          templateData: options.data,
-          templateHash: options.hash,
-          helperName: options.helperName
-        };
-
-        if (options.isWithHelper) {
-          viewClass = WithView;
-        }
-
-        // Create the view that will wrap the output of this template/property
-        // and add it to the nearest view's childViews array.
-        // See the documentation of Ember._HandlebarsBoundView for more.
-        var bindView = view.createChildView(viewClass, viewOptions);
-
-        view.appendChild(bindView);
-
-        observer = function() {
-          run.scheduleOnce('render', bindView, 'rerenderIfNeeded');
-        };
-      }
-
-      // Observes the given property on the context and
-      // tells the Ember._HandlebarsBoundView to re-render. If property
-      // is an empty string, we are printing the current context
-      // object ({{this}}) so updating it is not our responsibility.
-      if (typeof this === 'object' && normalized.path !== '') {
-        view.registerObserver(normalized.root, normalized.path, observer);
-        if (childProperties) {
-          for (i=0; i<childProperties.length; i++) {
-            view.registerObserver(normalized.root, normalized.path+'.'+childProperties[i], observer);
-          }
-        }
+        // The object is not observable, so just render it out and
+        // be done with it.
+        data.buffer.push(handlebarsGetEscaped(currentContext, property, options));
       }
     }
 
     function simpleBind(currentContext, property, options) {
-      var data = options.data;
-      var view = data.view;
-      var normalized, observer, pathRoot, output;
+      var data = options.data,
+          view = data.view,
+          normalized, observer, pathRoot, output;
 
       normalized = normalizePath(currentContext, property, data);
       pathRoot = normalized.root;
@@ -7399,10 +7145,6 @@ enifed("ember-handlebars/helpers/binding",
       return helpers.bind.call(this, property, options);
     }
 
-    var ISNT_HELPER_CACHE = new Cache(1000, function(key) {
-      return key.indexOf('-') === -1;
-    });
-    __exports__.ISNT_HELPER_CACHE = ISNT_HELPER_CACHE;
     /**
       Used to lookup/resolve handlebars helpers. The lookup order is:
 
@@ -7423,7 +7165,7 @@ enifed("ember-handlebars/helpers/binding",
         return helpers[name];
       }
 
-      if (!container || ISNT_HELPER_CACHE.get(name)) {
+      if (!container || name.indexOf('-') === -1) {
         return;
       }
 
@@ -7502,6 +7244,7 @@ enifed("ember-handlebars/helpers/binding",
       return bind.call(context, property, fn, true, shouldDisplayIfHelperContent, shouldDisplayIfHelperContent, ['isTruthy', 'length']);
     }
 
+
     /**
       @private
 
@@ -7521,11 +7264,11 @@ enifed("ember-handlebars/helpers/binding",
       @since 1.4.0
     */
     function unboundIfHelper(property, fn) {
-      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this;
-      var data = fn.data;
-      var template = fn.fn;
-      var inverse = fn.inverse;
-      var normalized, propertyValue, result;
+      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this,
+          data = fn.data,
+          template = fn.fn,
+          inverse = fn.inverse,
+          normalized, propertyValue, result;
 
       normalized = normalizePath(context, property, data);
       propertyValue = handlebarsGet(context, property, fn);
@@ -7616,8 +7359,7 @@ enifed("ember-handlebars/helpers/binding",
       @return {String} HTML string
     */
     function withHelper(context, options) {
-      var bindContext, preserveContext, controller;
-      var helperName = 'with';
+      var bindContext, preserveContext, controller, helperName = 'with';
 
       if (arguments.length === 4) {
         var keywordName, path, rootPath, normalized, contextPath;
@@ -7699,9 +7441,7 @@ enifed("ember-handlebars/helpers/binding",
     */
     function unlessHelper(context, options) {
             
-      var fn = options.fn;
-      var inverse = options.inverse;
-      var helperName = 'unless';
+      var fn = options.fn, inverse = options.inverse, helperName = 'unless';
 
       if (context) {
         helperName += ' ' + context;
@@ -7873,14 +7613,14 @@ enifed("ember-handlebars/helpers/binding",
       // For each attribute passed, create an observer and emit the
       // current value of the property as an attribute.
       forEach.call(attrKeys, function(attr) {
-        var path = attrs[attr];
-        var normalized;
+        var path = attrs[attr],
+            normalized;
 
         
         normalized = normalizePath(ctx, path, options.data);
 
-        var value = (path === 'this') ? normalized.root : handlebarsGet(ctx, path, options);
-        var type = typeOf(value);
+        var value = (path === 'this') ? normalized.root : handlebarsGet(ctx, path, options),
+            type = typeOf(value);
 
         
         var observer;
@@ -7965,15 +7705,14 @@ enifed("ember-handlebars/helpers/binding",
       @return {Array} An array of class names to add
     */
     function bindClasses(context, classBindings, view, bindAttrId, options) {
-      var ret = [];
-      var newClass, value, elem;
+      var ret = [], newClass, value, elem;
 
       // Helper method to retrieve the property from the context and
       // determine which class string to return, based on whether it is
       // a Boolean or not.
       var classStringForPath = function(root, parsedPath, options) {
-        var val;
-        var path = parsedPath.path;
+        var val,
+            path = parsedPath.path;
 
         if (path === 'this') {
           val = root;
@@ -7994,11 +7733,13 @@ enifed("ember-handlebars/helpers/binding",
         // closes over this variable, so it knows which string to remove when
         // the property changes.
         var oldClass;
+
         var observer;
-        var parsedPath = View._parsePropertyPath(binding);
-        var path = parsedPath.path;
-        var pathRoot = context;
-        var normalized;
+
+        var parsedPath = View._parsePropertyPath(binding),
+            path = parsedPath.path,
+            pathRoot = context,
+            normalized;
 
         if (path !== '' && path !== 'this') {
           normalized = normalizePath(context, path, options.data);
@@ -8068,7 +7809,7 @@ enifed("ember-handlebars/helpers/binding",
     __exports__.bindAttrHelperDeprecated = bindAttrHelperDeprecated;
     __exports__.bindClasses = bindClasses;
   });
-enifed("ember-handlebars/helpers/collection",
+define("ember-handlebars/helpers/collection",
   ["ember-metal/core","ember-metal/utils","ember-handlebars-compiler","ember-runtime/system/string","ember-metal/property_get","ember-handlebars/ext","ember-handlebars/helpers/view","ember-metal/computed","ember-views/views/collection_view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -8090,7 +7831,6 @@ enifed("ember-handlebars/helpers/collection",
     var fmt = __dependency4__.fmt;
     var get = __dependency5__.get;
     var handlebarsGet = __dependency6__.handlebarsGet;
-    var handlebarsGetView = __dependency6__.handlebarsGetView;
     var ViewHelper = __dependency7__.ViewHelper;
     var computed = __dependency8__.computed;
     var CollectionView = __dependency9__["default"];
@@ -8112,8 +7852,7 @@ enifed("ember-handlebars/helpers/collection",
       Given an empty `<body>` the following template:
 
       ```handlebars
-      {{! application.hbs }}
-      {{#collection content=model}}
+      {{#collection contentBinding="App.items"}}
         Hi {{view.content.name}}
       {{/collection}}
       ```
@@ -8121,45 +7860,44 @@ enifed("ember-handlebars/helpers/collection",
       And the following application code
 
       ```javascript
-      App = Ember.Application.create();
-      App.ApplicationRoute = Ember.Route.extend({
-        model: function(){
-          return [{name: 'Yehuda'},{name: 'Tom'},{name: 'Peter'}];
-        }
-      });
+      App = Ember.Application.create()
+      App.items = [
+        Ember.Object.create({name: 'Dave'}),
+        Ember.Object.create({name: 'Mary'}),
+        Ember.Object.create({name: 'Sara'})
+      ]
       ```
 
-      The following HTML will result:
+      Will result in the HTML structure below
 
       ```html
       <div class="ember-view">
-        <div class="ember-view">Hi Yehuda</div>
-        <div class="ember-view">Hi Tom</div>
-        <div class="ember-view">Hi Peter</div>
+        <div class="ember-view">Hi Dave</div>
+        <div class="ember-view">Hi Mary</div>
+        <div class="ember-view">Hi Sara</div>
       </div>
       ```
 
-      ### Non-block version of collection
+      ### Blockless use in a collection
 
-      If you provide an `itemViewClass` option that has its own `template` you may
+      If you provide an `itemViewClass` option that has its own `template` you can
       omit the block.
 
       The following template:
 
       ```handlebars
-      {{! application.hbs }}
-      {{collection content=model itemViewClass="an-item"}}
+      {{collection contentBinding="App.items" itemViewClass="App.AnItemView"}}
       ```
 
       And application code
 
       ```javascript
       App = Ember.Application.create();
-      App.ApplicationRoute = Ember.Route.extend({
-        model: function(){
-          return [{name: 'Yehuda'},{name: 'Tom'},{name: 'Peter'}];
-        }
-      });
+      App.items = [
+        Ember.Object.create({name: 'Dave'}),
+        Ember.Object.create({name: 'Mary'}),
+        Ember.Object.create({name: 'Sara'})
+      ];
 
       App.AnItemView = Ember.View.extend({
         template: Ember.Handlebars.compile("Greetings {{view.content.name}}")
@@ -8170,9 +7908,9 @@ enifed("ember-handlebars/helpers/collection",
 
       ```html
       <div class="ember-view">
-        <div class="ember-view">Greetings Yehuda</div>
-        <div class="ember-view">Greetings Tom</div>
-        <div class="ember-view">Greetings Peter</div>
+        <div class="ember-view">Greetings Dave</div>
+        <div class="ember-view">Greetings Mary</div>
+        <div class="ember-view">Greetings Sara</div>
       </div>
       ```
 
@@ -8183,13 +7921,11 @@ enifed("ember-handlebars/helpers/collection",
       the helper by passing it as the first argument:
 
       ```handlebars
-      {{#collection "my-custom-collection" content=model}}
+      {{#collection App.MyCustomCollectionClass contentBinding="App.items"}}
         Hi {{view.content.name}}
       {{/collection}}
       ```
 
-      This example would look for the class `App.MyCustomCollection`.
-
       ### Forwarded `item.*`-named Options
 
       As with the `{{view}}`, helper options passed to the `{{collection}}` will be
@@ -8198,7 +7934,7 @@ enifed("ember-handlebars/helpers/collection",
       item (note the camelcasing):
 
       ```handlebars
-      {{#collection content=model
+      {{#collection contentBinding="App.items"
                     itemTagName="p"
                     itemClassNames="greeting"}}
         Howdy {{view.content.name}}
@@ -8209,9 +7945,9 @@ enifed("ember-handlebars/helpers/collection",
 
       ```html
       <div class="ember-view">
-        <p class="ember-view greeting">Howdy Yehuda</p>
-        <p class="ember-view greeting">Howdy Tom</p>
-        <p class="ember-view greeting">Howdy Peter</p>
+        <p class="ember-view greeting">Howdy Dave</p>
+        <p class="ember-view greeting">Howdy Mary</p>
+        <p class="ember-view greeting">Howdy Sara</p>
       </div>
       ```
 
@@ -8231,38 +7967,38 @@ enifed("ember-handlebars/helpers/collection",
               } else {
               }
 
-      var fn        = options.fn,
-          data      = options.data,
-          inverse   = options.inverse,
-          view      = options.data.view,
-          // This should be deterministic, and should probably come from a
-          // parent view and not the controller.
-          container = (view.controller && view.controller.container ? view.controller.container : view.container);
+      var fn = options.fn;
+      var data = options.data;
+      var inverse = options.inverse;
+      var view = options.data.view;
 
+
+      var controller, container;
       // If passed a path string, convert that into an object.
       // Otherwise, just default to the standard class.
       var collectionClass;
       if (path) {
-        collectionClass = handlebarsGetView(this, path, container, options);
+        controller = data.keywords.controller;
+        container = controller && controller.container;
+        collectionClass = handlebarsGet(this, path, options) || container.lookupFactory('view:' + path);
               }
       else {
         collectionClass = CollectionView;
       }
 
-      var hash = options.hash;
-      var itemHash = {};
-      var match;
+      var hash = options.hash, itemHash = {}, match;
 
       // Extract item view class if provided else default to the standard class
-      var collectionPrototype = collectionClass.proto();
-      var itemViewClass;
+      var collectionPrototype = collectionClass.proto(), itemViewClass;
 
       if (hash.itemView) {
-        itemViewClass = handlebarsGetView(this, hash.itemView, container, options);
-      } else if (hash.itemViewClass) {
-        itemViewClass = handlebarsGetView(collectionPrototype, hash.itemViewClass, container, options);
+        controller = data.keywords.controller;
+                container = controller.container;
+        itemViewClass = container.lookupFactory('view:' + hash.itemView);
+              } else if (hash.itemViewClass) {
+        itemViewClass = handlebarsGet(collectionPrototype, hash.itemViewClass, options);
       } else {
-        itemViewClass = handlebarsGetView(collectionPrototype, collectionPrototype.itemViewClass, container, options);
+        itemViewClass = collectionPrototype.itemViewClass;
       }
 
       
@@ -8298,7 +8034,7 @@ enifed("ember-handlebars/helpers/collection",
               tagName: itemHash.tagName
         });
       } else if (hash.emptyViewClass) {
-        emptyViewClass = handlebarsGetView(this, hash.emptyViewClass, container, options);
+        emptyViewClass = handlebarsGet(this, hash.emptyViewClass, options);
       }
       if (emptyViewClass) { hash.emptyView = emptyViewClass; }
 
@@ -8318,7 +8054,7 @@ enifed("ember-handlebars/helpers/collection",
 
     __exports__["default"] = collectionHelper;
   });
-enifed("ember-handlebars/helpers/debug",
+define("ember-handlebars/helpers/debug",
   ["ember-metal/core","ember-metal/utils","ember-metal/logger","ember-metal/property_get","ember-handlebars/ext","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -8352,18 +8088,18 @@ enifed("ember-handlebars/helpers/debug",
       @param {String} property
     */
     function logHelper() {
-      var params = a_slice.call(arguments, 0, -1);
-      var options = arguments[arguments.length - 1];
-      var logger = Logger.log;
-      var values = [];
-      var allowPrimitives = true;
+      var params = a_slice.call(arguments, 0, -1),
+          options = arguments[arguments.length - 1],
+          logger = Logger.log,
+          values = [],
+          allowPrimitives = true;
 
       for (var i = 0; i < params.length; i++) {
         var type = options.types[i];
 
         if (type === 'ID' || !allowPrimitives) {
-          var context = (options.contexts && options.contexts[i]) || this;
-          var normalized = normalizePath(context, params[i], options.data);
+          var context = (options.contexts && options.contexts[i]) || this,
+              normalized = normalizePath(context, params[i], options.data);
 
           if (normalized.path === 'this') {
             values.push(normalized.root);
@@ -8424,7 +8160,7 @@ enifed("ember-handlebars/helpers/debug",
     __exports__.logHelper = logHelper;
     __exports__.debuggerHelper = debuggerHelper;
   });
-enifed("ember-handlebars/helpers/each",
+define("ember-handlebars/helpers/each",
   ["ember-metal/core","ember-handlebars-compiler","ember-runtime/system/string","ember-metal/property_get","ember-metal/property_set","ember-views/views/collection_view","ember-metal/binding","ember-runtime/mixins/controller","ember-runtime/controllers/array_controller","ember-runtime/mixins/array","ember-runtime/copy","ember-metal/run_loop","ember-metal/events","ember-handlebars/ext","ember-metal/computed","ember-metal/observer","ember-handlebars/views/metamorph_view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
     "use strict";
@@ -8435,6 +8171,7 @@ enifed("ember-handlebars/helpers/each",
     */
     var Ember = __dependency1__["default"];
     // Ember.assert;, Ember.K
+    // var emberAssert = Ember.assert,
     var K = Ember.K;
 
     var EmberHandlebars = __dependency2__["default"];
@@ -8553,9 +8290,20 @@ enifed("ember-handlebars/helpers/each",
       }
     });
 
+    // Defeatureify doesn't seem to like nested functions that need to be removed
+    function _addMetamorphCheck() {
+      EachView.reopen({
+        _checkMetamorph: on('didInsertElement', function() {
+                  })
+      });
+    }
+
+    // until ember-debug is es6ed
+    var runInDebug = function(f){ f(); };
+    
     var GroupedEach = EmberHandlebars.GroupedEach = function(context, path, options) {
-      var self = this;
-      var normalized = EmberHandlebars.normalizePath(context, path, options.data);
+      var self = this,
+          normalized = EmberHandlebars.normalizePath(context, path, options.data);
 
       this.context = context;
       this.path = path;
@@ -8626,11 +8374,11 @@ enifed("ember-handlebars/helpers/each",
       render: function() {
         if (!this.content) { return; }
 
-        var content = this.content;
-        var contentLength = get(content, 'length');
-        var options = this.options;
-        var data = options.data;
-        var template = this.template;
+        var content = this.content,
+            contentLength = get(content, 'length'),
+            options = this.options,
+            data = options.data,
+            template = this.template;
 
         data.insideEach = true;
         for (var i = 0; i < contentLength; i++) {
@@ -8660,161 +8408,131 @@ enifed("ember-handlebars/helpers/each",
     };
 
     /**
-      The `{{#each}}` helper loops over elements in a collection. It is an extension
-      of the base Handlebars `{{#each}}` helper.
-
-      The default behavior of `{{#each}}` is to yield its inner block once for every
-      item in an array. Each yield will provide the item as the context of the block.
+      The `{{#each}}` helper loops over elements in a collection, rendering its
+      block once for each item. It is an extension of the base Handlebars `{{#each}}`
+      helper:
 
       ```javascript
-      var developers = [{name: 'Yehuda'},{name: 'Tom'}, {name: 'Paul'}];
+      Developers = [{name: 'Yehuda'},{name: 'Tom'}, {name: 'Paul'}];
       ```
 
       ```handlebars
-      {{#each developers}}
+      {{#each Developers}}
         {{name}}
-        {{! `this` is each developer }}
       {{/each}}
       ```
 
-      `{{#each}}` supports an alternative syntax with element naming. This preserves
-      context of the yielded block:
+      `{{each}}` supports an alternative syntax with element naming:
 
       ```handlebars
-      {{#each person in developers}}
+      {{#each person in Developers}}
         {{person.name}}
-        {{! `this` is whatever it was outside the #each }}
       {{/each}}
       ```
 
-      The same rules apply to arrays of primitives, but the items may need to be
-      references with `{{this}}`.
+      When looping over objects that do not have properties, `{{this}}` can be used
+      to render the object:
 
       ```javascript
-      var developerNames = ['Yehuda', 'Tom', 'Paul']
+      DeveloperNames = ['Yehuda', 'Tom', 'Paul']
       ```
 
       ```handlebars
-      {{#each developerNames}}
+      {{#each DeveloperNames}}
         {{this}}
       {{/each}}
       ```
-
       ### {{else}} condition
-
       `{{#each}}` can have a matching `{{else}}`. The contents of this block will render
       if the collection is empty.
 
       ```
-      {{#each person in developers}}
+      {{#each person in Developers}}
         {{person.name}}
       {{else}}
         <p>Sorry, nobody is available for this task.</p>
       {{/each}}
       ```
-
-      ### Specifying an alternative view for each item
-
-      `itemViewClass` can control which view will be used during the render of each
-      item's template.
+      ### Specifying a View class for items
+      If you provide an `itemViewClass` option that references a view class
+      with its own `template` you can omit the block.
 
       The following template:
 
       ```handlebars
-      <ul>
-      {{#each developers itemViewClass="person"}}
-        {{name}}
-      {{/each}}
-      </ul>
+      {{#view App.MyView }}
+        {{each view.items itemViewClass="App.AnItemView"}}
+      {{/view}}
       ```
 
-      Will use the following view for each item
+      And application code
 
       ```javascript
-      App.PersonView = Ember.View.extend({
-        tagName: 'li'
+      App = Ember.Application.create({
+        MyView: Ember.View.extend({
+          items: [
+            Ember.Object.create({name: 'Dave'}),
+            Ember.Object.create({name: 'Mary'}),
+            Ember.Object.create({name: 'Sara'})
+          ]
+        })
+      });
+
+      App.AnItemView = Ember.View.extend({
+        template: Ember.Handlebars.compile("Greetings {{name}}")
       });
       ```
 
-      Resulting in HTML output that looks like the following:
+      Will result in the HTML structure below
 
       ```html
-      <ul>
-        <li class="ember-view">Yehuda</li>
-        <li class="ember-view">Tom</li>
-        <li class="ember-view">Paul</li>
-      </ul>
+      <div class="ember-view">
+        <div class="ember-view">Greetings Dave</div>
+        <div class="ember-view">Greetings Mary</div>
+        <div class="ember-view">Greetings Sara</div>
+      </div>
       ```
 
-      `itemViewClass` also enables a non-block form of `{{each}}`. The view
-      must {{#crossLink "Ember.View/toc_templates"}}provide its own template{{/crossLink}},
-      and then the block should be dropped. An example that outputs the same HTML
-      as the previous one:
+      If an `itemViewClass` is defined on the helper, and therefore the helper is not
+      being used as a block, an `emptyViewClass` can also be provided optionally.
+      The `emptyViewClass` will match the behavior of the `{{else}}` condition
+      described above. That is, the `emptyViewClass` will render if the collection
+      is empty.
+
+      ### Representing each item with a Controller.
+      By default the controller lookup within an `{{#each}}` block will be
+      the controller of the template where the `{{#each}}` was used. If each
+      item needs to be presented by a custom controller you can provide a
+      `itemController` option which references a controller by lookup name.
+      Each item in the loop will be wrapped in an instance of this controller
+      and the item itself will be set to the `model` property of that controller.
+
+      This is useful in cases where properties of model objects need transformation
+      or synthesis for display:
 
       ```javascript
-      App.PersonView = Ember.View.extend({
-        tagName: 'li',
-        template: '{{name}}'
-      });
-      ```
-
-      ```handlebars
-      <ul>
-        {{each developers itemViewClass="person"}}
-      </ul>
-      ```
-
-      ### Specifying an alternative view for no items (else)
-
-      The `emptyViewClass` option provides the same flexibility to the `{{else}}`
-      case of the each helper.
-
-      ```javascript
-      App.NoPeopleView = Ember.View.extend({
-        tagName: 'li',
-        template: 'No person is available, sorry'
-      });
-      ```
-
-      ```handlebars
-      <ul>
-      {{#each developers emptyViewClass="no-people"}}
-        <li>{{name}}</li>
-      {{/each}}
-      </ul>
-      ```
-
-      ### Wrapping each item in a controller
-
-      Controllers in Ember manage state and decorate data. In many cases,
-      providing a controller for each item in a list can be useful.
-      Specifically, an {{#crossLink "Ember.ObjectController"}}Ember.ObjectController{{/crossLink}}
-      should probably be used. Item controllers are passed the item they
-      will present as a `model` property, and an object controller will
-      proxy property lookups to `model` for us.
-
-      This allows state and decoration to be added to the controller
-      while any other property lookups are delegated to the model. An example:
-
-      ```javascript
-      App.RecruitController = Ember.ObjectController.extend({
+      App.DeveloperController = Ember.ObjectController.extend({
         isAvailableForHire: function() {
-          return !this.get('isEmployed') && this.get('isSeekingWork');
+          return !this.get('model.isEmployed') && this.get('model.isSeekingWork');
         }.property('isEmployed', 'isSeekingWork')
       })
       ```
 
       ```handlebars
-      {{#each person in developers itemController="recruit"}}
+      {{#each person in developers itemController="developer"}}
         {{person.name}} {{#if person.isAvailableForHire}}Hire me!{{/if}}
       {{/each}}
       ```
 
+      Each itemController will receive a reference to the current controller as
+      a `parentController` property.
+
       ### (Experimental) Grouped Each
 
-      If a list's membership often changes, but properties of items in that
-      group rarely change, a significant improvement in template rendering
-      time can be achieved by using the experimental [group helper](https://github.com/emberjs/group-helper).
+      When used in conjunction with the experimental [group helper](https://github.com/emberjs/group-helper),
+      you can inform Handlebars to re-render an entire group of items instead of
+      re-rendering them one at a time (in the event that they are changed en masse
+      or an item is added/removed).
 
       ```handlebars
       {{#group}}
@@ -8824,32 +8542,33 @@ enifed("ember-handlebars/helpers/each",
       {{/group}}
       ```
 
-      When the membership of `people` changes, or when any property changes, the entire
-      `{{#group}}` block will be re-rendered.
+      This can be faster than the normal way that Handlebars re-renders items
+      in some cases.
 
-      An `{{#each}}` inside the `{{#group}}` helper can opt-out of the special group
-      behavior by passing the `groupedRows` option. For example:
+      If for some reason you have a group with more than one `#each`, you can make
+      one of the collections be updated in normal (non-grouped) fashion by setting
+      the option `groupedRows=true` (counter-intuitive, I know).
+
+      For example,
 
       ```handlebars
+      {{dealershipName}}
+
       {{#group}}
         {{#each dealers}}
-          {{! uses group's special behavior }}
           {{firstName}} {{lastName}}
         {{/each}}
 
         {{#each car in cars groupedRows=true}}
-          {{! does not use group's special behavior }}
           {{car.make}} {{car.model}} {{car.color}}
         {{/each}}
       {{/group}}
       ```
+      Any change to `dealershipName` or the `dealers` collection will cause the
+      entire group to be re-rendered. However, changes to the `cars` collection
+      will be re-rendered individually (as normal).
 
-      Any change to the `dealers` collection will cause the entire group to be re-rendered.
-      Changes to the `cars` collection will be re-rendered individually, as they are with
-      normal `{{#each}}` usage.
-
-      `{{#group}}` is implemented with an `itemViewClass`, so specifying an `itemViewClass`
-      on an `{{#each}}` will also disable the special re-rendering behavior.
+      Note that `group` behavior is also disabled by specifying an `itemViewClass`.
 
       @method each
       @for Ember.Handlebars.helpers
@@ -8857,13 +8576,11 @@ enifed("ember-handlebars/helpers/each",
       @param [path] {String} path
       @param [options] {Object} Handlebars key/value pairs of options
       @param [options.itemViewClass] {String} a path to a view class used for each item
-      @param [options.emptyViewClass] {String} a path to a view class used for each item
       @param [options.itemController] {String} name of a controller to be created for each item
       @param [options.groupedRows] {boolean} enable normal item-by-item rendering when inside a `#group` helper
     */
     function eachHelper(path, options) {
-      var ctx;
-      var helperName = 'each';
+      var ctx, helperName = 'each';
 
       if (arguments.length === 4) {
         
@@ -8898,7 +8615,8 @@ enifed("ember-handlebars/helpers/each",
       if (options.data.insideGroup && !options.hash.groupedRows && !options.hash.itemViewClass) {
         new GroupedEach(ctx, path, options).render();
       } else {
-        return helpers.collection.call(ctx, EmberHandlebars.EachView, options);
+        // ES6TODO: figure out how to do this without global lookup.
+        return helpers.collection.call(ctx, 'Ember.Handlebars.EachView', options);
       }
     }
 
@@ -8906,7 +8624,7 @@ enifed("ember-handlebars/helpers/each",
     __exports__.GroupedEach = GroupedEach;
     __exports__.eachHelper = eachHelper;
   });
-enifed("ember-handlebars/helpers/loc",
+define("ember-handlebars/helpers/loc",
   ["ember-runtime/system/string","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -8917,31 +8635,26 @@ enifed("ember-handlebars/helpers/loc",
     @submodule ember-handlebars
     */
 
+    // ES6TODO:
+    // Pretty sure this can be expressed as
+    // var locHelper EmberStringUtils.loc ?
+
     /**
       Calls [Ember.String.loc](/api/classes/Ember.String.html#method_loc) with the
       provided string.
 
-      This is a convenient way to localize text within a template:
-
-      ```javascript
-      Ember.STRINGS = {
-        '_welcome_': 'Bonjour'
-      };
-      ```
-
-      ```handlebars
-      <div class='message'>
-        {{loc '_welcome_'}}
-      </div>
-      ```
+      This is a convenient way to localize text. For example:
 
       ```html
-      <div class='message'>
-        Bonjour
-      </div>
+      <script type="text/x-handlebars" data-template-name="home">
+        {{loc "welcome"}}
+      </script>
       ```
 
-      See [Ember.String.loc](/api/classes/Ember.String.html#method_loc) for how to
+      Take note that `"welcome"` is a string and not an object
+      reference.
+
+      See [Ember.String.loc](/api/classes/Ember.String.html#method_loc) for how to 
       set up localized string references.
 
       @method loc
@@ -8949,9 +8662,11 @@ enifed("ember-handlebars/helpers/loc",
       @param {String} str The string to format
       @see {Ember.String#loc}
     */
-    __exports__["default"] = loc;
+    __exports__["default"] = function locHelper(str) {
+      return loc(str);
+    }
   });
-enifed("ember-handlebars/helpers/partial",
+define("ember-handlebars/helpers/partial",
   ["ember-metal/core","ember-metal/is_none","ember-handlebars/ext","ember-handlebars/helpers/binding","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -9061,17 +8776,17 @@ enifed("ember-handlebars/helpers/partial",
       template(context, { data: options.data });
     }
   });
-enifed("ember-handlebars/helpers/shared",
+define("ember-handlebars/helpers/shared",
   ["ember-handlebars/ext","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
     var handlebarsGet = __dependency1__.handlebarsGet;
 
     __exports__["default"] = function resolvePaths(options) {
-      var ret = [];
-      var contexts = options.contexts;
-      var roots = options.roots;
-      var data = options.data;
+      var ret = [],
+          contexts = options.contexts,
+          roots = options.roots,
+          data = options.data;
 
       for (var i=0, l=contexts.length; i<l; i++) {
         ret.push(handlebarsGet(roots[i], contexts[i], { data: data }));
@@ -9080,12 +8795,12 @@ enifed("ember-handlebars/helpers/shared",
       return ret;
     }
   });
-enifed("ember-handlebars/helpers/template",
+define("ember-handlebars/helpers/template",
   ["ember-metal/core","ember-handlebars-compiler","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
-    // Ember.deprecate;
+    // var emberDeprecate = Ember.deprecate;
 
     var EmberHandlebars = __dependency2__["default"];
     var helpers = EmberHandlebars.helpers;
@@ -9095,6 +8810,43 @@ enifed("ember-handlebars/helpers/template",
     */
 
     /**
+      `template` allows you to render a template from inside another template.
+      This allows you to re-use the same template in multiple places. For example:
+
+      ```html
+      <script type="text/x-handlebars" data-template-name="logged_in_user">
+        {{#with loggedInUser}}
+          Last Login: {{lastLogin}}
+          User Info: {{template "user_info"}}
+        {{/with}}
+      </script>
+      ```
+
+      ```html
+      <script type="text/x-handlebars" data-template-name="user_info">
+        Name: <em>{{name}}</em>
+        Karma: <em>{{karma}}</em>
+      </script>
+      ```
+
+      ```handlebars
+      {{#if isUser}}
+        {{template "user_info"}}
+      {{else}}
+        {{template "unlogged_user_info"}}
+      {{/if}}
+      ```
+
+      This helper looks for templates in the global `Ember.TEMPLATES` hash. If you
+      add `<script>` tags to your page with the `data-template-name` attribute set,
+      they will be compiled and placed in this hash automatically.
+
+      You can also manually register templates by adding them to the hash:
+
+      ```javascript
+      Ember.TEMPLATES["my_cool_template"] = Ember.Handlebars.compile('<b>{{user}}</b>');
+      ```
+
       @deprecated
       @method template
       @for Ember.Handlebars.helpers
@@ -9107,7 +8859,7 @@ enifed("ember-handlebars/helpers/template",
       return helpers.partial.apply(this, arguments);
     }
   });
-enifed("ember-handlebars/helpers/unbound",
+define("ember-handlebars/helpers/unbound",
   ["ember-handlebars-compiler","ember-handlebars/helpers/binding","ember-handlebars/ext","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -9147,9 +8899,9 @@ enifed("ember-handlebars/helpers/unbound",
       @return {String} HTML string
     */
     __exports__["default"] = function unboundHelper(property, fn) {
-      var options = arguments[arguments.length - 1];
-      var container = options.data.view.container;
-      var helper, context, out, ctx;
+      var options = arguments[arguments.length - 1],
+          container = options.data.view.container,
+          helper, context, out, ctx;
 
       ctx = this;
       if (arguments.length > 2) {
@@ -9165,9 +8917,9 @@ enifed("ember-handlebars/helpers/unbound",
       return handlebarsGet(context, property, fn);
     }
   });
-enifed("ember-handlebars/helpers/view",
-  ["ember-metal/core","ember-runtime/system/object","ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-views/system/jquery","ember-views/views/view","ember-metal/binding","ember-metal/keys","ember-handlebars/ext","ember-runtime/system/string","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+define("ember-handlebars/helpers/view",
+  ["ember-metal/core","ember-runtime/system/object","ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-views/system/jquery","ember-views/views/view","ember-metal/binding","ember-handlebars/ext","ember-runtime/system/string","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
     /*globals Handlebars */
 
@@ -9187,19 +8939,17 @@ enifed("ember-handlebars/helpers/view",
     var jQuery = __dependency6__["default"];
     var View = __dependency7__["default"];
     var isGlobalPath = __dependency8__.isGlobalPath;
-    var keys = __dependency9__["default"];
-    var normalizePath = __dependency10__.normalizePath;
-    var handlebarsGet = __dependency10__.handlebarsGet;
-    var handlebarsGetView = __dependency10__.handlebarsGetView;
-    var EmberString = __dependency11__["default"];
+    var normalizePath = __dependency9__.normalizePath;
+    var handlebarsGet = __dependency9__.handlebarsGet;
+    var EmberString = __dependency10__["default"];
 
 
-    var LOWERCASE_A_Z = /^[a-z]/;
-    var VIEW_PREFIX = /^view\./;
+    var LOWERCASE_A_Z = /^[a-z]/,
+        VIEW_PREFIX = /^view\./;
 
     function makeBindings(thisContext, options) {
-      var hash = options.hash;
-      var hashType = options.hashTypes;
+      var hash = options.hash,
+          hashType = options.hashTypes;
 
       for (var prop in hash) {
         if (hashType[prop] === 'ID') {
@@ -9226,71 +8976,73 @@ enifed("ember-handlebars/helpers/view",
     }
 
     var ViewHelper = EmberObject.create({
-      propertiesFromHTMLOptions: function(options) {
-        var hash    = options.hash;
-        var data    = options.data;
-        var classes = hash['class'];
 
-        var extensions = {
-          helperName: options.helperName || ''
-        };
+      propertiesFromHTMLOptions: function(options) {
+        var hash = options.hash, data = options.data;
+        var extensions = {},
+            classes = hash['class'],
+            dup = false;
 
         if (hash.id) {
           extensions.elementId = hash.id;
+          dup = true;
         }
 
         if (hash.tag) {
           extensions.tagName = hash.tag;
+          dup = true;
         }
 
         if (classes) {
           classes = classes.split(' ');
           extensions.classNames = classes;
+          dup = true;
         }
 
         if (hash.classBinding) {
           extensions.classNameBindings = hash.classBinding.split(' ');
+          dup = true;
         }
 
         if (hash.classNameBindings) {
-          if (extensions.classNameBindings === undefined) {
-            extensions.classNameBindings = [];
-          }
+          if (extensions.classNameBindings === undefined) extensions.classNameBindings = [];
           extensions.classNameBindings = extensions.classNameBindings.concat(hash.classNameBindings.split(' '));
+          dup = true;
         }
 
         if (hash.attributeBindings) {
                     extensions.attributeBindings = null;
+          dup = true;
+        }
+
+        if (dup) {
+          hash = jQuery.extend({}, hash);
+          delete hash.id;
+          delete hash.tag;
+          delete hash['class'];
+          delete hash.classBinding;
         }
 
         // Set the proper context for all bindings passed to the helper. This applies to regular attribute bindings
         // as well as class name bindings. If the bindings are local, make them relative to the current context
         // instead of the view.
         var path;
-        var hashKeys = keys(hash);
 
-        for (var i = 0, l = hashKeys.length; i < l; i++) {
-          var prop      = hashKeys[i];
-          var isBinding = IS_BINDING.test(prop);
-
-          if (prop !== 'classNameBindings') {
-            extensions[prop] = hash[prop];
-          }
+        // Evaluate the context of regular attribute bindings:
+        for (var prop in hash) {
+          if (!hash.hasOwnProperty(prop)) { continue; }
 
           // Test if the property ends in "Binding"
-          if (isBinding && typeof extensions[prop] === 'string') {
+          if (IS_BINDING.test(prop) && typeof hash[prop] === 'string') {
             path = this.contextualizeBindingPath(hash[prop], data);
-            if (path) {
-              extensions[prop] = path;
-            }
+            if (path) { hash[prop] = path; }
           }
         }
 
+        // Evaluate the context of class name bindings:
         if (extensions.classNameBindings) {
-          // Evaluate the context of class name bindings:
-          for (var j = 0, k = extensions.classNameBindings.length; j < k; j++) {
-            var full = extensions.classNameBindings[j];
-
+          for (var b in extensions.classNameBindings) {
+            var full = extensions.classNameBindings[b];
             if (typeof full === 'string') {
               // Contextualize the path of classNameBinding so this:
               //
@@ -9300,17 +9052,15 @@ enifed("ember-handlebars/helpers/view",
               //
               //     classNameBinding="_parentView.context.isGreen:green"
               var parsedPath = View._parsePropertyPath(full);
-              if (parsedPath.path !== '') {
-                path = this.contextualizeBindingPath(parsedPath.path, data);
-                if (path) {
-                  extensions.classNameBindings[j] = path + parsedPath.classNames;
-                }
+              if(parsedPath.path !== '') {
+                path = this.contextualizeBindingPath(parsedPath.path, data); 
+                if (path) { extensions.classNameBindings[b] = path + parsedPath.classNames; }
               }
             }
           }
         }
 
-        return extensions;
+        return jQuery.extend(hash, extensions);
       },
 
       // Transform bindings from the current context to a context that can be evaluated within the view.
@@ -9332,25 +9082,40 @@ enifed("ember-handlebars/helpers/view",
       },
 
       helper: function(thisContext, path, options) {
-        var data = options.data;
-        var fn   = options.fn;
-        var newView;
-        var newViewProto;
+        var data = options.data,
+            fn = options.fn,
+            newView;
 
         makeBindings(thisContext, options);
 
-        var container = this.container || (data && data.view && data.view.container);
-        newView = handlebarsGetView(thisContext, path, container, options);
+        if ('string' === typeof path) {
+          var lookup;
+          // TODO: this is a lame conditional, this should likely change
+          // but something along these lines will likely need to be added
+          // as deprecation warnings
+          //
+          if (options.types[0] === 'STRING' && LOWERCASE_A_Z.test(path) && !VIEW_PREFIX.test(path)) {
+            lookup = path;
+          } else {
+            newView = handlebarsGet(thisContext, path, options);
+            if (typeof newView === 'string') {
+              lookup = newView;
+            }
+          }
 
-        if (View.detectInstance(newView)) {
-          newViewProto = newView;
-        } else {
-          newViewProto = newView.proto();
+          if (lookup) {
+                        newView = data.view.container.lookupFactory('view:' + lookup);
+          }
+
+                  } else {
+          newView = path;
         }
 
+        
         var viewOptions = this.propertiesFromHTMLOptions(options, thisContext);
         var currentView = data.view;
         viewOptions.templateData = data;
+        var newViewProto = newView.proto ? newView.proto() : newView;
 
         if (fn) {
                     viewOptions.template = fn;
@@ -9362,28 +9127,9 @@ enifed("ember-handlebars/helpers/view",
           viewOptions._context = thisContext;
         }
 
-        currentView.appendChild(newView, viewOptions);
-      },
-
-      instanceHelper: function(thisContext, newView, options) {
-        var data = options.data;
-        var fn   = options.fn;
-
-        makeBindings(thisContext, options);
-
-        
-        var viewOptions = this.propertiesFromHTMLOptions(options, thisContext);
-        var currentView = data.view;
-        viewOptions.templateData = data;
-
-        if (fn) {
-                    viewOptions.template = fn;
-        }
-
-        // We only want to override the `_context` computed property if there is
-        // no specified controller. See View#_context for more information.
-        if (!newView.controller && !newView.controllerBinding && !viewOptions.controller && !viewOptions.controllerBinding) {
-          viewOptions._context = thisContext;
+        // for instrumentation
+        if (options.helperName) {
+          viewOptions.helperName = options.helperName;
         }
 
         currentView.appendChild(newView, viewOptions);
@@ -9494,7 +9240,7 @@ enifed("ember-handlebars/helpers/view",
       specify a path to a custom view class.
 
       ```handlebars
-      {{#view "custom"}}{{! will look up App.CustomView }}
+      {{#view "MyApp.CustomView"}}
         hello.
       {{/view}}
       ```
@@ -9508,7 +9254,7 @@ enifed("ember-handlebars/helpers/view",
         innerViewClass: Ember.View.extend({
           classNames: ['a-custom-view-class-as-property']
         }),
-        template: Ember.Handlebars.compile('{{#view view.innerViewClass}} hi {{/view}}')
+        template: Ember.Handlebars.compile('{{#view "view.innerViewClass"}} hi {{/view}}')
       });
 
       MyApp.OuterView.create().appendTo('body');
@@ -9531,21 +9277,8 @@ enifed("ember-handlebars/helpers/view",
       supplying a block. Attempts to use both a `templateName` option and supply a
       block will throw an error.
 
-      ```javascript
-      var App = Ember.Application.create();
-      App.WithTemplateDefinedView = Ember.View.extend({
-        templateName: 'defined-template'
-      });
-      ```
-
       ```handlebars
-      {{! application.hbs }}
-      {{view 'with-template-defined'}}
-      ```
-
-      ```handlebars
-      {{! defined-template.hbs }}
-      Some content for the defined template view.
+      {{view "MyApp.ViewWithATemplateDefined"}}
       ```
 
       ### `viewName` property
@@ -9574,11 +9307,7 @@ enifed("ember-handlebars/helpers/view",
       // and get an instance of the registered `view:toplevel`
       if (path && path.data && path.data.isRenderData) {
         options = path;
-        if (options.data && options.data.view && options.data.view.container) {
-          path = options.data.view.container.lookupFactory('view:toplevel');
-        } else {
-          path = View;
-        }
+                path = options.data.view.container.lookupFactory('view:toplevel');
       }
 
       options.helperName = options.helperName || 'view';
@@ -9588,7 +9317,7 @@ enifed("ember-handlebars/helpers/view",
 
     __exports__.viewHelper = viewHelper;
   });
-enifed("ember-handlebars/helpers/yield",
+define("ember-handlebars/helpers/yield",
   ["ember-metal/core","ember-metal/property_get","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -9699,7 +9428,7 @@ enifed("ember-handlebars/helpers/yield",
       view._yield(this, options);
     }
   });
-enifed("ember-handlebars/loader",
+define("ember-handlebars/loader",
   ["ember-handlebars/component_lookup","ember-views/system/jquery","ember-metal/error","ember-runtime/system/lazy_load","ember-handlebars-compiler","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -9743,12 +9472,12 @@ enifed("ember-handlebars/loader",
 
         var compile = (script.attr('type') === 'text/x-raw-handlebars') ?
                       jQuery.proxy(Handlebars.compile, Handlebars) :
-                      jQuery.proxy(EmberHandlebars.compile, EmberHandlebars);
-        // Get the name of the script, used by Ember.View's templateName property.
-        // First look for data-template-name attribute, then fall back to its
-        // id if no name is found.
-        var templateName = script.attr('data-template-name') || script.attr('id') || 'application';
-        var template = compile(script.html());
+                      jQuery.proxy(EmberHandlebars.compile, EmberHandlebars),
+          // Get the name of the script, used by Ember.View's templateName property.
+          // First look for data-template-name attribute, then fall back to its
+          // id if no name is found.
+          templateName = script.attr('data-template-name') || script.attr('id') || 'application',
+          template = compile(script.html());
 
         // Check if template of same name already exists
         if (Ember.TEMPLATES[templateName] !== undefined) {
@@ -9797,7 +9526,7 @@ enifed("ember-handlebars/loader",
 
     __exports__["default"] = bootstrap;
   });
-enifed("ember-handlebars/string",
+define("ember-handlebars/string",
   ["ember-runtime/system/string","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -9819,9 +9548,6 @@ enifed("ember-handlebars/string",
       @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
     */
     function htmlSafe(str) {
-      if (typeof str !== 'string') {
-        str = ''+str;
-      }
       return new Handlebars.SafeString(str);
     }
 
@@ -9848,9 +9574,9 @@ enifed("ember-handlebars/string",
 
     __exports__["default"] = htmlSafe;
   });
-enifed("ember-handlebars/views/handlebars_bound_view",
-  ["ember-handlebars-compiler","ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-views/views/view","ember-handlebars/string","ember-views/views/states","ember-handlebars/views/metamorph_view","ember-handlebars/ext","ember-metal/utils","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
+define("ember-handlebars/views/handlebars_bound_view",
+  ["ember-handlebars-compiler","ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-views/views/view","ember-views/views/states","ember-handlebars/views/metamorph_view","ember-handlebars/ext","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
     /*globals Handlebars, Metamorph:true */
     /*jshint newcap:false*/
@@ -9869,33 +9595,34 @@ enifed("ember-handlebars/views/handlebars_bound_view",
     // Ember.K
     var K = Ember.K;
 
+    var Metamorph = requireModule('metamorph');
+
     var EmberError = __dependency3__["default"];
     var get = __dependency4__.get;
     var set = __dependency5__.set;
     var merge = __dependency6__["default"];
     var run = __dependency7__["default"];
-    var View = __dependency8__["default"];
-    var htmlSafe = __dependency9__["default"];
+    var computed = __dependency8__.computed;
+    var View = __dependency9__["default"];
     var cloneStates = __dependency10__.cloneStates;
     var states = __dependency10__.states;
     var viewStates = states;
 
     var _MetamorphView = __dependency11__["default"];
     var handlebarsGet = __dependency12__.handlebarsGet;
-    var uuid = __dependency13__.uuid;
 
     function SimpleHandlebarsView(path, pathRoot, isEscaped, templateData) {
       this.path = path;
       this.pathRoot = pathRoot;
       this.isEscaped = isEscaped;
       this.templateData = templateData;
-      this[Ember.GUID_KEY] = uuid();
+
       this._lastNormalizedValue = undefined;
+      this.morph = Metamorph();
       this.state = 'preRender';
       this.updateId = null;
       this._parentView = null;
       this.buffer = null;
-      this._morph = null;
     }
 
     SimpleHandlebarsView.prototype = {
@@ -9921,7 +9648,6 @@ enifed("ember-handlebars/views/handlebars_bound_view",
       normalizedValue: function() {
         var path = this.path;
         var pathRoot = this.pathRoot;
-        var escape = this.isEscaped;
         var result, templateData;
 
         // Use the pathRoot as the result if no path is provided. This
@@ -9935,17 +9661,33 @@ enifed("ember-handlebars/views/handlebars_bound_view",
           result = handlebarsGet(pathRoot, path, { data: templateData });
         }
 
-        if (!escape && !(result instanceof SafeString)) {
-          result = htmlSafe(result);
-        }
-
         return result;
       },
 
-      render: function(buffer) {
-        var value = this.normalizedValue();
-        this._lastNormalizedValue = value;
-        buffer._element = value;
+      renderToBuffer: function(buffer) {
+        var string = '';
+
+        string += this.morph.startTag();
+        string += this.render();
+        string += this.morph.endTag();
+
+        buffer.push(string);
+      },
+
+      render: function(value) {
+        // If not invoked via a triple-mustache ({{{foo}}}), escape
+        // the content of the template.
+        var escape = this.isEscaped;
+        var result = value || this.normalizedValue();
+        this._lastNormalizedValue = result;
+        if (result === null || result === undefined) {
+          result = "";
+        } else if (!(result instanceof SafeString)) {
+          result = String(result);
+        }
+
+        if (escape) { result = Handlebars.Utils.escapeExpression(result); }
+        return result;
       },
 
       rerender: function() {
@@ -9960,16 +9702,15 @@ enifed("ember-handlebars/views/handlebars_bound_view",
             this.updateId = run.scheduleOnce('render', this, 'update');
             break;
         }
+
         return this;
       },
 
       update: function () {
         this.updateId = null;
         var value = this.normalizedValue();
-        // doesn't diff SafeString instances
         if (value !== this._lastNormalizedValue) {
-          this._lastNormalizedValue = value;
-          this._morph.update(value);
+          this.morph.html(this.render(value));
         }
       },
 
@@ -10092,10 +9833,10 @@ enifed("ember-handlebars/views/handlebars_bound_view",
       pathRoot: null,
 
       normalizedValue: function() {
-        var path = get(this, 'path');
-        var pathRoot  = get(this, 'pathRoot');
-        var valueNormalizer = get(this, 'valueNormalizerFunc');
-        var result, templateData;
+        var path = get(this, 'path'),
+            pathRoot  = get(this, 'pathRoot'),
+            valueNormalizer = get(this, 'valueNormalizerFunc'),
+            result, templateData;
 
         // Use the pathRoot as the result if no path is provided. This
         // happens if the path is `this`, which gets normalized into
@@ -10137,15 +9878,14 @@ enifed("ember-handlebars/views/handlebars_bound_view",
         // the content of the template.
         var escape = get(this, 'isEscaped');
 
-        var shouldDisplay = get(this, 'shouldDisplayFunc');
-        var preserveContext = get(this, 'preserveContext');
-        var context = get(this, 'previousContext');
+        var shouldDisplay = get(this, 'shouldDisplayFunc'),
+            preserveContext = get(this, 'preserveContext'),
+            context = get(this, 'previousContext');
 
-        var inverseTemplate = get(this, 'inverseTemplate');
-        var displayTemplate = get(this, 'displayTemplate');
+        var inverseTemplate = get(this, 'inverseTemplate'),
+            displayTemplate = get(this, 'displayTemplate');
 
         var result = this.normalizedValue();
-
         this._lastNormalizedValue = result;
 
         // First, test the conditional to see if we should
@@ -10195,30 +9935,93 @@ enifed("ember-handlebars/views/handlebars_bound_view",
     __exports__._HandlebarsBoundView = _HandlebarsBoundView;
     __exports__.SimpleHandlebarsView = SimpleHandlebarsView;
   });
-enifed("ember-handlebars/views/metamorph_view",
-  ["ember-metal/core","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-metal/run_loop","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+define("ember-handlebars/views/metamorph_view",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-metal/run_loop","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     /* global Metamorph:true */
 
     /*jshint newcap:false*/
     var Ember = __dependency1__["default"];
     // Ember.deprecate
+    // var emberDeprecate = Ember.deprecate;
 
-    var CoreView = __dependency2__["default"];
-    var View = __dependency3__["default"];
-    var Mixin = __dependency4__.Mixin;
-    var run = __dependency5__["default"];
+    var get = __dependency2__.get;
+    var set = __dependency3__["default"];
+
+    var CoreView = __dependency4__["default"];
+    var View = __dependency5__["default"];
+    var Mixin = __dependency6__.Mixin;
+    var run = __dependency7__["default"];
 
     /**
     @module ember
     @submodule ember-handlebars
     */
 
+    var Metamorph = requireModule('metamorph');
+
     function notifyMutationListeners() {
       run.once(View, 'notifyMutationListeners');
     }
 
+    // DOMManager should just abstract dom manipulation between jquery and metamorph
+    var DOMManager = {
+      remove: function(view) {
+        view.morph.remove();
+        notifyMutationListeners();
+      },
+
+      prepend: function(view, html) {
+        view.morph.prepend(html);
+        notifyMutationListeners();
+      },
+
+      after: function(view, html) {
+        view.morph.after(html);
+        notifyMutationListeners();
+      },
+
+      html: function(view, html) {
+        view.morph.html(html);
+        notifyMutationListeners();
+      },
+
+      // This is messed up.
+      replace: function(view) {
+        var morph = view.morph;
+
+        view._transitionTo('preRender');
+
+        run.schedule('render', this, function renderMetamorphView() {
+          if (view.isDestroying) { return; }
+
+          view.clearRenderedChildren();
+          var buffer = view.renderToBuffer();
+
+          view.invokeRecursively(function(view) {
+            view.propertyWillChange('element');
+          });
+          view.triggerRecursively('willInsertElement');
+
+          morph.replaceWith(buffer.string());
+          view._transitionTo('inDOM');
+
+          view.invokeRecursively(function(view) {
+            view.propertyDidChange('element');
+          });
+          view.triggerRecursively('didInsertElement');
+
+          notifyMutationListeners();
+        });
+      },
+
+      empty: function(view) {
+        view.morph.html("");
+        notifyMutationListeners();
+      }
+    };
+
     // The `morph` and `outerHTML` properties are internal only
     // and not observable.
 
@@ -10235,9 +10038,30 @@ enifed("ember-handlebars/views/metamorph_view",
 
       init: function() {
         this._super();
-              }
+        this.morph = Metamorph();
+              },
+
+      beforeRender: function(buffer) {
+        buffer.push(this.morph.startTag());
+        buffer.pushOpeningTag();
+      },
+
+      afterRender: function(buffer) {
+        buffer.pushClosingTag();
+        buffer.push(this.morph.endTag());
+      },
+
+      createElement: function() {
+        var buffer = this.renderToBuffer();
+        this.outerHTML = buffer.string();
+        this.clearBuffer();
+      },
+
+      domManager: DOMManager
     });
     __exports__._Metamorph = _Metamorph;
+    var _wrapMap = Metamorph._wrapMap;
+    __exports__._wrapMap = _wrapMap;
     /**
       @class _MetamorphView
       @namespace Ember
@@ -10257,306 +10081,9 @@ enifed("ember-handlebars/views/metamorph_view",
     var _SimpleMetamorphView = CoreView.extend(_Metamorph);
     __exports__._SimpleMetamorphView = _SimpleMetamorphView;__exports__["default"] = View.extend(_Metamorph);
   });
-enifed("ember-metal-views",
-  ["ember-metal-views/renderer","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var Renderer = __dependency1__["default"];
-    __exports__.Renderer = Renderer;
-  });
-enifed("ember-metal-views/renderer",
-  ["morph","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var DOMHelper = __dependency1__.DOMHelper;
-
-    function Renderer() {
-      this._uuid = 0;
-      this._views = new Array(2000);
-      this._queue = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
-      this._parents = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
-      this._elements = new Array(17);
-      this._inserts = {};
-      this._dom = new DOMHelper();
-    }
-
-    function Renderer_renderTree(_view, _parentView, _insertAt) {
-      var views = this._views;
-      views[0] = _view;
-      var insertAt = _insertAt === undefined ? -1 : _insertAt;
-      var index = 0;
-      var total = 1;
-      var levelBase = _parentView ? _parentView._level+1 : 0;
-
-      var root = _parentView == null ? _view : _parentView._root;
-
-      // if root view has a _morph assigned
-      var willInsert = !!root._morph;
-
-      var queue = this._queue;
-      queue[0] = 0;
-      var length = 1;
-
-      var parentIndex = -1;
-      var parents = this._parents;
-      var parent = _parentView || null;
-      var elements = this._elements;
-      var element = null;
-      var contextualElement = null;
-      var level = 0;
-
-      var view = _view;
-      var children, i, l, child;
-      while (length) {
-        elements[level] = element;
-        if (!view._morph) {
-          // ensure props we add are in same order
-          view._morph = null;
-        }
-        view._root = root;
-        this.uuid(view);
-        view._level = levelBase + level;
-        if (view._elementCreated) {
-          this.remove(view, false, true);
-        }
-
-        this.willCreateElement(view);
-
-        contextualElement = view._morph && view._morph.contextualElement;
-        if (!contextualElement && parent && parent._childViewsMorph) {
-          contextualElement = parent._childViewsMorph.contextualElement;
-        }
-        if (!contextualElement && view._didCreateElementWithoutMorph) {
-          // This code path is only used by createElement and rerender when createElement
-          // was previously called on a view.
-          contextualElement = document.body;
-        }
-                element = this.createElement(view, contextualElement);
-
-        parents[level++] = parentIndex;
-        parentIndex = index;
-        parent = view;
-
-        // enqueue for end
-        queue[length++] = index;
-        // enqueue children
-        children = this.childViews(view);
-        if (children) {
-          for (i=children.length-1;i>=0;i--) {
-            child = children[i];
-            index = total++;
-            views[index] = child;
-            queue[length++] = index;
-            view = child;
-          }
-        }
-
-        index = queue[--length];
-        view = views[index];
-
-        while (parentIndex === index) {
-          level--;
-          view._elementCreated = true;
-          this.didCreateElement(view);
-          if (willInsert) {
-            this.willInsertElement(view);
-          }
-
-          if (level === 0) {
-            length--;
-            break;
-          }
-
-          parentIndex = parents[level];
-          parent = parentIndex === -1 ? _parentView : views[parentIndex];
-          this.insertElement(view, parent, element, -1);
-          index = queue[--length];
-          view = views[index];
-          element = elements[level];
-          elements[level] = null;
-        }
-      }
-
-      this.insertElement(view, _parentView, element, insertAt);
-
-      for (i=total-1;i>=0;i--) {
-        if (willInsert) {
-          views[i]._elementInserted = true;
-          this.didInsertElement(views[i]);
-        }
-        views[i] = null;
-      }
-
-      return element;
-    }
-
-    Renderer.prototype.uuid = function Renderer_uuid(view) {
-      if (view._uuid === undefined) {
-        view._uuid = ++this._uuid;
-        view._renderer = this;
-      } // else assert(view._renderer === this)
-      return view._uuid;
-    };
-
-    Renderer.prototype.scheduleInsert =
-      function Renderer_scheduleInsert(view, morph) {
-        if (view._morph || view._elementCreated) {
-          throw new Error("You cannot insert a View that has already been rendered");
-        }
-                view._morph = morph;
-        var viewId = this.uuid(view);
-        this._inserts[viewId] = this.scheduleRender(this, function() {
-          this._inserts[viewId] = null;
-          this.renderTree(view);
-        });
-      };
-
-    Renderer.prototype.appendTo =
-      function Renderer_appendTo(view, target) {
-        var morph = this._dom.appendMorph(target);
-        this.scheduleInsert(view, morph);
-      };
-
-    Renderer.prototype.replaceIn =
-      function Renderer_replaceIn(view, target) {
-        var morph = this._dom.createMorph(target, null, null);
-        this.scheduleInsert(view, morph);
-      };
-
-    function Renderer_remove(_view, shouldDestroy, reset) {
-      var viewId = this.uuid(_view);
-
-      if (this._inserts[viewId]) {
-        this.cancelRender(this._inserts[viewId]);
-        this._inserts[viewId] = undefined;
-      }
-
-      if (!_view._elementCreated) {
-        return;
-      }
-
-      var removeQueue = [];
-      var destroyQueue = [];
-      var morph = _view._morph;
-      var  idx, len, view, staticChildren, queue,
-        childViews, i, l, parentView;
-
-      removeQueue.push(_view);
-
-      for (idx=0; idx<removeQueue.length; idx++) {
-        view = removeQueue[idx];
-
-        if (!shouldDestroy && view._childViewsMorph) {
-          queue = removeQueue;
-        } else {
-          queue = destroyQueue;
-        }
-
-        this.beforeRemove(removeQueue[idx]);
-
-        childViews = view._childViews;
-        if (childViews) {
-          for (i=0,l=childViews.length; i<l; i++) {
-            queue.push(childViews[i]);
-          }
-        }
-      }
-
-      for (idx=0; idx<destroyQueue.length; idx++) {
-        view = destroyQueue[idx];
-
-        this.beforeRemove(destroyQueue[idx]);
-
-        childViews = view._childViews;
-        if (childViews) {
-          for (i=0,l=childViews.length; i<l; i++) {
-            destroyQueue.push(childViews[i]);
-          }
-        }
-      }
-
-      // destroy DOM from root insertion
-      if (morph && !reset) {
-        morph.destroy();
-      }
-
-      for (idx=0, len=removeQueue.length; idx < len; idx++) {
-        this.afterRemove(removeQueue[idx], false);
-      }
-
-      for (idx=0, len=destroyQueue.length; idx < len; idx++) {
-        this.afterRemove(destroyQueue[idx], true);
-      }
-
-      if (reset) {
-        _view._morph = morph;
-      }
-    }
-
-    function Renderer_insertElement(view, parentView, element, index) {
-      if (element === null || element === undefined) return;
-      if (view._morph) {
-        view._morph.update(element);
-      } else if (parentView) {
-        if (index === -1) {
-          view._morph = parentView._childViewsMorph.append(element);
-        } else {
-          view._morph = parentView._childViewsMorph.insert(index, element);
-        }
-      }
-    }
-
-    function Renderer_beforeRemove(view) {
-      if (view._elementCreated) {
-        this.willDestroyElement(view);
-      }
-      if (view._elementInserted) {
-        this.willRemoveElement(view);
-      }
-    }
-
-    function Renderer_afterRemove(view, shouldDestroy) {
-      view._elementInserted = false;
-      view._morph = null;
-      view._childViewsMorph = null;
-      if (view._elementCreated) {
-        view._elementCreated = false;
-        this.didDestroyElement(view);
-      }
-      if (shouldDestroy) {
-        this.destroyView(view);
-      }
-    }
-
-    Renderer.prototype.remove = Renderer_remove;
-    Renderer.prototype.destroy = function (view) {
-      this.remove(view, true);
-    };
-
-    Renderer.prototype.renderTree = Renderer_renderTree;
-    Renderer.prototype.insertElement = Renderer_insertElement;
-    Renderer.prototype.beforeRemove = Renderer_beforeRemove;
-    Renderer.prototype.afterRemove = Renderer_afterRemove;
-
-    /// HOOKS
-    var noop = function () {};
-
-    Renderer.prototype.willCreateElement = noop; // inBuffer
-    Renderer.prototype.createElement = noop; // renderToBuffer or createElement
-    Renderer.prototype.didCreateElement = noop; // hasElement
-    Renderer.prototype.willInsertElement = noop; // will place into DOM
-    Renderer.prototype.didInsertElement = noop; // inDOM // placed into DOM
-    Renderer.prototype.willRemoveElement = noop; // removed from DOM  willDestroyElement currently paired with didInsertElement
-    Renderer.prototype.willDestroyElement = noop; // willClearRender (currently balanced with render) this is now paired with createElement
-    Renderer.prototype.didDestroyElement = noop; // element destroyed so view.destroy shouldn't try to remove it removedFromDOM
-    Renderer.prototype.destroyView = noop;
-    Renderer.prototype.childViews = noop;
-
-    __exports__["default"] = Renderer;
-  });
-enifed("ember-metal",
-  ["ember-metal/core","ember-metal/merge","ember-metal/instrumentation","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/cache","ember-metal/platform","ember-metal/array","ember-metal/logger","ember-metal/property_get","ember-metal/events","ember-metal/observer_set","ember-metal/property_events","ember-metal/properties","ember-metal/property_set","ember-metal/map","ember-metal/get_properties","ember-metal/set_properties","ember-metal/watch_key","ember-metal/chains","ember-metal/watch_path","ember-metal/watching","ember-metal/expand_properties","ember-metal/computed","ember-metal/computed_macros","ember-metal/observer","ember-metal/mixin","ember-metal/binding","ember-metal/run_loop","ember-metal/libraries","ember-metal/is_none","ember-metal/is_empty","ember-metal/is_blank","ember-metal/is_present","ember-metal/keys","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __dependency34__, __dependency35__, __dependency36__, __exports__) {
+define("ember-metal",
+  ["ember-metal/core","ember-metal/merge","ember-metal/instrumentation","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/platform","ember-metal/array","ember-metal/logger","ember-metal/property_get","ember-metal/events","ember-metal/observer_set","ember-metal/property_events","ember-metal/properties","ember-metal/property_set","ember-metal/map","ember-metal/get_properties","ember-metal/set_properties","ember-metal/watch_key","ember-metal/chains","ember-metal/watch_path","ember-metal/watching","ember-metal/expand_properties","ember-metal/computed","ember-metal/computed_macros","ember-metal/observer","ember-metal/mixin","ember-metal/binding","ember-metal/run_loop","ember-metal/libraries","ember-metal/is_none","ember-metal/is_empty","ember-metal/is_blank","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __exports__) {
     "use strict";
     /**
     Ember Metal
@@ -10574,6 +10101,7 @@ enifed("ember-metal",
     var reset = __dependency3__.reset;
     var generateGuid = __dependency4__.generateGuid;
     var GUID_KEY = __dependency4__.GUID_KEY;
+    var GUID_PREFIX = __dependency4__.GUID_PREFIX;
     var guidFor = __dependency4__.guidFor;
     var META_DESC = __dependency4__.META_DESC;
     var EMPTY_META = __dependency4__.EMPTY_META;
@@ -10595,103 +10123,100 @@ enifed("ember-metal",
     var uuid = __dependency4__.uuid;
     var EmberError = __dependency5__["default"];
     var EnumerableUtils = __dependency6__["default"];
-    var Cache = __dependency7__["default"];
-    var create = __dependency8__.create;
-    var hasPropertyAccessors = __dependency8__.hasPropertyAccessors;
-    var filter = __dependency9__.filter;
-    var forEach = __dependency9__.forEach;
-    var indexOf = __dependency9__.indexOf;
-    var map = __dependency9__.map;
-    var Logger = __dependency10__["default"];
 
-    var get = __dependency11__.get;
-    var getWithDefault = __dependency11__.getWithDefault;
-    var normalizeTuple = __dependency11__.normalizeTuple;
-    var _getPath = __dependency11__._getPath;
+    var create = __dependency7__.create;
+    var platform = __dependency7__.platform;
+    var map = __dependency8__.map;
+    var forEach = __dependency8__.forEach;
+    var filter = __dependency8__.filter;
+    var indexOf = __dependency8__.indexOf;
+    var Logger = __dependency9__["default"];
 
-    var on = __dependency12__.on;
-    var addListener = __dependency12__.addListener;
-    var removeListener = __dependency12__.removeListener;
-    var suspendListener = __dependency12__.suspendListener;
-    var suspendListeners = __dependency12__.suspendListeners;
-    var sendEvent = __dependency12__.sendEvent;
-    var hasListeners = __dependency12__.hasListeners;
-    var watchedEvents = __dependency12__.watchedEvents;
-    var listenersFor = __dependency12__.listenersFor;
-    var listenersDiff = __dependency12__.listenersDiff;
-    var listenersUnion = __dependency12__.listenersUnion;
+    var get = __dependency10__.get;
+    var getWithDefault = __dependency10__.getWithDefault;
+    var normalizeTuple = __dependency10__.normalizeTuple;
+    var _getPath = __dependency10__._getPath;
 
-    var ObserverSet = __dependency13__["default"];
+    var on = __dependency11__.on;
+    var addListener = __dependency11__.addListener;
+    var removeListener = __dependency11__.removeListener;
+    var suspendListener = __dependency11__.suspendListener;
+    var suspendListeners = __dependency11__.suspendListeners;
+    var sendEvent = __dependency11__.sendEvent;
+    var hasListeners = __dependency11__.hasListeners;
+    var watchedEvents = __dependency11__.watchedEvents;
+    var listenersFor = __dependency11__.listenersFor;
+    var listenersDiff = __dependency11__.listenersDiff;
+    var listenersUnion = __dependency11__.listenersUnion;
 
-    var propertyWillChange = __dependency14__.propertyWillChange;
-    var propertyDidChange = __dependency14__.propertyDidChange;
-    var overrideChains = __dependency14__.overrideChains;
-    var beginPropertyChanges = __dependency14__.beginPropertyChanges;
-    var endPropertyChanges = __dependency14__.endPropertyChanges;
-    var changeProperties = __dependency14__.changeProperties;
+    var ObserverSet = __dependency12__["default"];
 
-    var Descriptor = __dependency15__.Descriptor;
-    var defineProperty = __dependency15__.defineProperty;
-    var set = __dependency16__.set;
-    var trySet = __dependency16__.trySet;
+    var propertyWillChange = __dependency13__.propertyWillChange;
+    var propertyDidChange = __dependency13__.propertyDidChange;
+    var overrideChains = __dependency13__.overrideChains;
+    var beginPropertyChanges = __dependency13__.beginPropertyChanges;
+    var endPropertyChanges = __dependency13__.endPropertyChanges;
+    var changeProperties = __dependency13__.changeProperties;
 
-    var OrderedSet = __dependency17__.OrderedSet;
-    var Map = __dependency17__.Map;
-    var MapWithDefault = __dependency17__.MapWithDefault;
-    var getProperties = __dependency18__["default"];
-    var setProperties = __dependency19__["default"];
-    var watchKey = __dependency20__.watchKey;
-    var unwatchKey = __dependency20__.unwatchKey;
-    var flushPendingChains = __dependency21__.flushPendingChains;
-    var removeChainWatcher = __dependency21__.removeChainWatcher;
-    var ChainNode = __dependency21__.ChainNode;
-    var finishChains = __dependency21__.finishChains;
-    var watchPath = __dependency22__.watchPath;
-    var unwatchPath = __dependency22__.unwatchPath;
-    var watch = __dependency23__.watch;
-    var isWatching = __dependency23__.isWatching;
-    var unwatch = __dependency23__.unwatch;
-    var rewatch = __dependency23__.rewatch;
-    var destroy = __dependency23__.destroy;
-    var expandProperties = __dependency24__["default"];
-    var ComputedProperty = __dependency25__.ComputedProperty;
-    var computed = __dependency25__.computed;
-    var cacheFor = __dependency25__.cacheFor;
+    var Descriptor = __dependency14__.Descriptor;
+    var defineProperty = __dependency14__.defineProperty;
+    var set = __dependency15__.set;
+    var trySet = __dependency15__.trySet;
+
+    var OrderedSet = __dependency16__.OrderedSet;
+    var Map = __dependency16__.Map;
+    var MapWithDefault = __dependency16__.MapWithDefault;
+    var getProperties = __dependency17__["default"];
+    var setProperties = __dependency18__["default"];
+    var watchKey = __dependency19__.watchKey;
+    var unwatchKey = __dependency19__.unwatchKey;
+    var flushPendingChains = __dependency20__.flushPendingChains;
+    var removeChainWatcher = __dependency20__.removeChainWatcher;
+    var ChainNode = __dependency20__.ChainNode;
+    var finishChains = __dependency20__.finishChains;
+    var watchPath = __dependency21__.watchPath;
+    var unwatchPath = __dependency21__.unwatchPath;
+    var watch = __dependency22__.watch;
+    var isWatching = __dependency22__.isWatching;
+    var unwatch = __dependency22__.unwatch;
+    var rewatch = __dependency22__.rewatch;
+    var destroy = __dependency22__.destroy;
+    var expandProperties = __dependency23__["default"];
+    var ComputedProperty = __dependency24__.ComputedProperty;
+    var computed = __dependency24__.computed;
+    var cacheFor = __dependency24__.cacheFor;
 
     // side effect of defining the computed.* macros
 
-    var addObserver = __dependency27__.addObserver;
-    var observersFor = __dependency27__.observersFor;
-    var removeObserver = __dependency27__.removeObserver;
-    var addBeforeObserver = __dependency27__.addBeforeObserver;
-    var _suspendBeforeObserver = __dependency27__._suspendBeforeObserver;
-    var _suspendObserver = __dependency27__._suspendObserver;
-    var _suspendBeforeObservers = __dependency27__._suspendBeforeObservers;
-    var _suspendObservers = __dependency27__._suspendObservers;
-    var beforeObserversFor = __dependency27__.beforeObserversFor;
-    var removeBeforeObserver = __dependency27__.removeBeforeObserver;
-    var IS_BINDING = __dependency28__.IS_BINDING;
-    var mixin = __dependency28__.mixin;
-    var Mixin = __dependency28__.Mixin;
-    var required = __dependency28__.required;
-    var aliasMethod = __dependency28__.aliasMethod;
-    var observer = __dependency28__.observer;
-    var immediateObserver = __dependency28__.immediateObserver;
-    var beforeObserver = __dependency28__.beforeObserver;
-    var Binding = __dependency29__.Binding;
-    var isGlobalPath = __dependency29__.isGlobalPath;
-    var bind = __dependency29__.bind;
-    var oneWay = __dependency29__.oneWay;
-    var run = __dependency30__["default"];
-    var libraries = __dependency31__["default"];
-    var isNone = __dependency32__.isNone;
-    var none = __dependency32__.none;
-    var isEmpty = __dependency33__.isEmpty;
-    var empty = __dependency33__.empty;
-    var isBlank = __dependency34__["default"];
-    var isPresent = __dependency35__["default"];
-    var keys = __dependency36__["default"];
-
+    var addObserver = __dependency26__.addObserver;
+    var observersFor = __dependency26__.observersFor;
+    var removeObserver = __dependency26__.removeObserver;
+    var addBeforeObserver = __dependency26__.addBeforeObserver;
+    var _suspendBeforeObserver = __dependency26__._suspendBeforeObserver;
+    var _suspendObserver = __dependency26__._suspendObserver;
+    var _suspendBeforeObservers = __dependency26__._suspendBeforeObservers;
+    var _suspendObservers = __dependency26__._suspendObservers;
+    var beforeObserversFor = __dependency26__.beforeObserversFor;
+    var removeBeforeObserver = __dependency26__.removeBeforeObserver;
+    var IS_BINDING = __dependency27__.IS_BINDING;
+    var mixin = __dependency27__.mixin;
+    var Mixin = __dependency27__.Mixin;
+    var required = __dependency27__.required;
+    var aliasMethod = __dependency27__.aliasMethod;
+    var observer = __dependency27__.observer;
+    var immediateObserver = __dependency27__.immediateObserver;
+    var beforeObserver = __dependency27__.beforeObserver;
+    var Binding = __dependency28__.Binding;
+    var isGlobalPath = __dependency28__.isGlobalPath;
+    var bind = __dependency28__.bind;
+    var oneWay = __dependency28__.oneWay;
+    var run = __dependency29__["default"];
+    var libraries = __dependency30__["default"];
+    var isNone = __dependency31__.isNone;
+    var none = __dependency31__.none;
+    var isEmpty = __dependency32__.isEmpty;
+    var empty = __dependency32__.empty;
+    var isBlank = __dependency33__["default"];
     // END IMPORTS
 
     // BEGIN EXPORTS
@@ -10704,16 +10229,11 @@ enifed("ember-metal",
     Ember.instrument = instrument;
     Ember.subscribe = subscribe;
 
-    Ember._Cache = Cache;
-
     Ember.generateGuid    = generateGuid;
     Ember.GUID_KEY        = GUID_KEY;
+    Ember.GUID_PREFIX     = GUID_PREFIX;
     Ember.create          = create;
-    Ember.keys            = keys;
-    Ember.platform        = {
-      defineProperty: defineProperty,
-      hasPropertyAccessors: hasPropertyAccessors
-    };
+    Ember.platform        = platform;
 
     var EmberArrayPolyfills = Ember.ArrayPolyfills = {};
 
@@ -10847,10 +10367,6 @@ enifed("ember-metal",
 
     Ember.isBlank = isBlank;
 
-    
-      Ember.isPresent = isPresent;
-    
-
     Ember.merge = merge;
 
     /**
@@ -10884,7 +10400,7 @@ enifed("ember-metal",
 
     __exports__["default"] = Ember;
   });
-enifed("ember-metal/alias",
+define("ember-metal/alias",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/error","ember-metal/properties","ember-metal/computed","ember-metal/platform","ember-metal/utils","ember-metal/dependent_keys","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -10964,7 +10480,7 @@ enifed("ember-metal/alias",
     AliasedProperty.prototype._meta = undefined;
     AliasedProperty.prototype.meta = ComputedProperty.prototype.meta;
   });
-enifed("ember-metal/array",
+define("ember-metal/array",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -10981,26 +10497,22 @@ enifed("ember-metal/array",
       return func && Function.prototype.toString.call(func).indexOf('[native code]') > -1;
     };
 
-    var defineNativeShim = function(nativeFunc, shim) {
-      if (isNativeFunc(nativeFunc)) {
-        return nativeFunc;
-      }
-      return shim;
-    };
-
     // From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/map
-    var map = defineNativeShim(ArrayPrototype.map, function(fun /*, thisp */) {
+    var map = isNativeFunc(ArrayPrototype.map) ? ArrayPrototype.map : function(fun /*, thisp */) {
       //"use strict";
 
-      if (this === void 0 || this === null || typeof fun !== "function") {
+      if (this === void 0 || this === null) {
         throw new TypeError();
       }
 
       var t = Object(this);
       var len = t.length >>> 0;
+      if (typeof fun !== "function") {
+        throw new TypeError();
+      }
+
       var res = new Array(len);
       var thisp = arguments[1];
-
       for (var i = 0; i < len; i++) {
         if (i in t) {
           res[i] = fun.call(thisp, t[i], i, t);
@@ -11008,61 +10520,44 @@ enifed("ember-metal/array",
       }
 
       return res;
-    });
+    };
 
     // From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/foreach
-    var forEach = defineNativeShim(ArrayPrototype.forEach, function(fun /*, thisp */) {
+    var forEach = isNativeFunc(ArrayPrototype.forEach) ? ArrayPrototype.forEach : function(fun /*, thisp */) {
       //"use strict";
 
-      if (this === void 0 || this === null || typeof fun !== "function") {
+      if (this === void 0 || this === null) {
         throw new TypeError();
       }
 
       var t = Object(this);
       var len = t.length >>> 0;
-      var thisp = arguments[1];
+      if (typeof fun !== "function") {
+        throw new TypeError();
+      }
 
+      var thisp = arguments[1];
       for (var i = 0; i < len; i++) {
         if (i in t) {
           fun.call(thisp, t[i], i, t);
         }
       }
-    });
-
-    var indexOf = defineNativeShim(ArrayPrototype.indexOf, function (obj, fromIndex) {
-      if (fromIndex === null || fromIndex === undefined) {
-        fromIndex = 0;
-      }
-      else if (fromIndex < 0) {
-        fromIndex = Math.max(0, this.length + fromIndex);
-      }
+    };
 
+    var indexOf = isNativeFunc(ArrayPrototype.indexOf) ? ArrayPrototype.indexOf : function (obj, fromIndex) {
+      if (fromIndex === null || fromIndex === undefined) { fromIndex = 0; }
+      else if (fromIndex < 0) { fromIndex = Math.max(0, this.length + fromIndex); }
       for (var i = fromIndex, j = this.length; i < j; i++) {
-        if (this[i] === obj) {
-          return i;
-        }
+        if (this[i] === obj) { return i; }
       }
       return -1;
-    });
+    };
 
-    var lastIndexOf = defineNativeShim(ArrayPrototype.lastIndexOf, function(obj, fromIndex) {
-        var len = this.length;
-        var idx;
-
-        if (fromIndex === undefined) fromIndex = len-1;
-        else fromIndex = (fromIndex < 0) ? Math.ceil(fromIndex) : Math.floor(fromIndex);
-        if (fromIndex < 0) fromIndex += len;
-
-        for(idx = fromIndex;idx>=0;idx--) {
-          if (this[idx] === obj) return idx ;
-        }
-        return -1;
-    });
-
-    var filter = defineNativeShim(ArrayPrototype.filter, function (fn, context) {
-      var i, value;
-      var result = [];
-      var length = this.length;
+    var filter = isNativeFunc(ArrayPrototype.filter) ? ArrayPrototype.filter : function (fn, context) {
+      var i,
+      value,
+      result = [],
+      length = this.length;
 
       for (i = 0; i < length; i++) {
         if (this.hasOwnProperty(i)) {
@@ -11073,14 +10568,25 @@ enifed("ember-metal/array",
         }
       }
       return result;
-    });
+    };
+
 
     if (Ember.SHIM_ES5) {
-      ArrayPrototype.map = ArrayPrototype.map || map;
-      ArrayPrototype.forEach = ArrayPrototype.forEach || forEach;
-      ArrayPrototype.filter = ArrayPrototype.filter || filter;
-      ArrayPrototype.indexOf = ArrayPrototype.indexOf || indexOf;
-      ArrayPrototype.lastIndexOf = ArrayPrototype.lastIndexOf || lastIndexOf;
+      if (!ArrayPrototype.map) {
+        ArrayPrototype.map = map;
+      }
+
+      if (!ArrayPrototype.forEach) {
+        ArrayPrototype.forEach = forEach;
+      }
+
+      if (!ArrayPrototype.filter) {
+        ArrayPrototype.filter = filter;
+      }
+
+      if (!ArrayPrototype.indexOf) {
+        ArrayPrototype.indexOf = indexOf;
+      }
     }
 
     /**
@@ -11093,10 +10599,9 @@ enifed("ember-metal/array",
     __exports__.forEach = forEach;
     __exports__.filter = filter;
     __exports__.indexOf = indexOf;
-    __exports__.lastIndexOf = lastIndexOf;
   });
-enifed("ember-metal/binding",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/observer","ember-metal/run_loop","ember-metal/path_cache","exports"],
+define("ember-metal/binding",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/map","ember-metal/observer","ember-metal/run_loop","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -11105,12 +10610,11 @@ enifed("ember-metal/binding",
     var set = __dependency3__.set;
     var trySet = __dependency3__.trySet;
     var guidFor = __dependency4__.guidFor;
-    var addObserver = __dependency5__.addObserver;
-    var removeObserver = __dependency5__.removeObserver;
-    var _suspendObserver = __dependency5__._suspendObserver;
-    var run = __dependency6__["default"];
-    var isGlobalPath = __dependency7__.isGlobal;
-
+    var Map = __dependency5__.Map;
+    var addObserver = __dependency6__.addObserver;
+    var removeObserver = __dependency6__.removeObserver;
+    var _suspendObserver = __dependency6__._suspendObserver;
+    var run = __dependency7__["default"];
 
     // ES6TODO: where is Ember.lookup defined?
     /**
@@ -11133,6 +10637,8 @@ enifed("ember-metal/binding",
     */
     Ember.LOG_BINDINGS = false || !!Ember.ENV.LOG_BINDINGS;
 
+    var IS_GLOBAL = /^([A-Z$]|([0-9][A-Z$]))/;
+
     /**
       Returns true if the provided path is global (e.g., `MyApp.fooController.bar`)
       instead of local (`foo.bar.baz`).
@@ -11143,6 +10649,9 @@ enifed("ember-metal/binding",
       @param {String} path
       @return Boolean
     */
+    function isGlobalPath(path) {
+      return IS_GLOBAL.test(path);
+    }
 
     function getWithGlobals(obj, path) {
       return get(isGlobalPath(path) ? Ember.lookup : obj, path);
@@ -11153,9 +10662,10 @@ enifed("ember-metal/binding",
     //
 
     function Binding(toPath, fromPath) {
-      this._direction = undefined;
+      this._direction = 'fwd';
       this._from = fromPath;
       this._to   = toPath;
+      this._directionMap = Map.create();
       this._readyToSync = undefined;
       this._oneWay = undefined;
     }
@@ -11256,8 +10766,7 @@ enifed("ember-metal/binding",
       */
       connect: function(obj) {
         
-        var fromPath = this._from;
-        var toPath = this._to;
+        var fromPath = this._from, toPath = this._to;
         trySet(obj, toPath, getWithGlobals(obj, fromPath));
 
         // add an observer on the object to be notified when the binding should be updated
@@ -11309,18 +10818,19 @@ enifed("ember-metal/binding",
       },
 
       _scheduleSync: function(obj, dir) {
-        var existingDir = this._direction;
+        var directionMap = this._directionMap;
+        var existingDir = directionMap.get(obj);
 
         // if we haven't scheduled the binding yet, schedule it
-        if (existingDir === undefined) {
+        if (!existingDir) {
           run.schedule('sync', this, this._sync, obj);
-          this._direction  = dir;
+          directionMap.set(obj, dir);
         }
 
         // If both a 'back' and 'fwd' sync have been scheduled on the same object,
         // default to a 'fwd' sync so that it remains deterministic.
         if (existingDir === 'back' && dir === 'fwd') {
-          this._direction = 'fwd';
+          directionMap.set(obj, 'fwd');
         }
       },
 
@@ -11332,12 +10842,12 @@ enifed("ember-metal/binding",
 
         // get the direction of the binding for the object we are
         // synchronizing from
-        var direction = this._direction;
+        var directionMap = this._directionMap;
+        var direction = directionMap.get(obj);
 
-        var fromPath = this._from;
-        var toPath = this._to;
+        var fromPath = this._from, toPath = this._to;
 
-        this._direction = undefined;
+        directionMap.remove(obj);
 
         // if we're synchronizing from the remote object...
         if (direction === 'fwd') {
@@ -11382,9 +10892,9 @@ enifed("ember-metal/binding",
         @method from
         @static
       */
-      from: function(from) {
-        var C = this;
-        return new C(undefined, from);
+      from: function() {
+        var C = this, binding = new C();
+        return binding.from.apply(binding, arguments);
       },
 
       /*
@@ -11393,9 +10903,9 @@ enifed("ember-metal/binding",
         @method to
         @static
       */
-      to: function(to) {
-        var C = this;
-        return new C(to, undefined);
+      to: function() {
+        var C = this, binding = new C();
+        return binding.to.apply(binding, arguments);
       },
 
       /**
@@ -11415,8 +10925,8 @@ enifed("ember-metal/binding",
         @return {Ember.Binding} `this`
       */
       oneWay: function(from, flag) {
-        var C = this;
-        return new C(undefined, from).oneWay(flag);
+        var C = this, binding = new C(null, from);
+        return binding.oneWay(flag);
       }
 
     });
@@ -11586,67 +11096,7 @@ enifed("ember-metal/binding",
     __exports__.oneWay = oneWay;__exports__.Binding = Binding;
     __exports__.isGlobalPath = isGlobalPath;
   });
-enifed("ember-metal/cache",
-  ["ember-metal/dictionary","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var dictionary = __dependency1__["default"];
-    __exports__["default"] = Cache;
-
-    function Cache(limit, func) {
-      this.store  = dictionary(null);
-      this.size   = 0;
-      this.misses = 0;
-      this.hits   = 0;
-      this.limit  = limit;
-      this.func   = func;
-    }
-
-    var FALSE     = function() { };
-    var ZERO      = function() { };
-    var UNDEFINED = function() { };
-    var NULL      = function() { };
-
-    Cache.prototype = {
-      set: function(key, value) {
-        if (this.limit > this.size) {
-          this.size ++;
-          if (value === undefined) {
-            this.store[key] = UNDEFINED;
-          } else {
-            this.store[key] = value;
-          }
-        }
-
-        return value;
-      },
-
-      get: function(key) {
-        var value = this.store[key];
-
-        if (value === undefined) {
-          this.misses ++;
-          value = this.set(key, this.func(key));
-        } else if (value === UNDEFINED) {
-          this.hits ++;
-          value = undefined;
-        } else {
-          this.hits ++;
-          // nothing to translate
-        }
-
-        return value;
-      },
-
-      purge: function() {
-        this.store  = dictionary(null);
-        this.size   = 0;
-        this.hits   = 0;
-        this.misses = 0;
-      }
-    };
-  });
-enifed("ember-metal/chains",
+define("ember-metal/chains",
   ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/array","ember-metal/watch_key","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -11655,13 +11105,14 @@ enifed("ember-metal/chains",
     var get = __dependency2__.get;
     var normalizeTuple = __dependency2__.normalizeTuple;
     var meta = __dependency3__.meta;
+    var META_KEY = __dependency3__.META_KEY;
     var forEach = __dependency4__.forEach;
     var watchKey = __dependency5__.watchKey;
     var unwatchKey = __dependency5__.unwatchKey;
 
-    var metaFor = meta;
-    var warn = Ember.warn;
-    var FIRST_KEY = /^([^\.]+)/;
+    var metaFor = meta,
+        warn = Ember.warn,
+        FIRST_KEY = /^([^\.]+)/;
 
     function firstKey(path) {
       return path.match(FIRST_KEY)[0];
@@ -11686,8 +11137,7 @@ enifed("ember-metal/chains",
     __exports__.flushPendingChains = flushPendingChains;function addChainWatcher(obj, keyName, node) {
       if (!obj || ('object' !== typeof obj)) { return; } // nothing to do
 
-      var m = metaFor(obj);
-      var nodes = m.chainWatchers;
+      var m = metaFor(obj), nodes = m.chainWatchers;
 
       if (!m.hasOwnProperty('chainWatchers')) {
         nodes = m.chainWatchers = {};
@@ -11701,7 +11151,7 @@ enifed("ember-metal/chains",
     function removeChainWatcher(obj, keyName, node) {
       if (!obj || 'object' !== typeof obj) { return; } // nothing to do
 
-      var m = obj['__ember_meta__'];
+      var m = obj[META_KEY];
       if (m && !m.hasOwnProperty('chainWatchers')) { return; } // nothing to do
 
       var nodes = m && m.chainWatchers;
@@ -11755,7 +11205,7 @@ enifed("ember-metal/chains",
     function lazyGet(obj, key) {
       if (!obj) return undefined;
 
-      var meta = obj['__ember_meta__'];
+      var meta = obj[META_KEY];
       // check if object meant only to be a prototype
       if (meta && meta.proto === obj) return undefined;
 
@@ -11792,10 +11242,8 @@ enifed("ember-metal/chains",
 
     // copies a top level object only
     ChainNodePrototype.copy = function(obj) {
-      var ret = new ChainNode(null, null, obj);
-      var paths = this._paths;
-      var path;
-
+      var ret = new ChainNode(null, null, obj),
+          paths = this._paths, path;
       for (path in paths) {
         if (paths[path] <= 0) { continue; } // this check will also catch non-number vals.
         ret.add(path);
@@ -11865,8 +11313,7 @@ enifed("ember-metal/chains",
     ChainNodePrototype.count = 0;
 
     ChainNodePrototype.chain = function(key, path, src) {
-      var chains = this._chains;
-      var node;
+      var chains = this._chains, node;
       if (!chains) { chains = this._chains = {}; }
 
       node = chains[key];
@@ -11882,8 +11329,7 @@ enifed("ember-metal/chains",
     };
 
     ChainNodePrototype.unchain = function(key, path) {
-      var chains = this._chains;
-      var node = chains[key];
+      var chains = this._chains, node = chains[key];
 
       // unchain rest of path first...
       if (path && path.length>1) {
@@ -11979,26 +11425,12 @@ enifed("ember-metal/chains",
 
     function finishChains(obj) {
       // We only create meta if we really have to
-      var m = obj['__ember_meta__'],
-        chains, chainWatchers, chainNodes;
-      if (m) {
-        // finish any current chains node watchers that reference obj
-        chainWatchers = m.chainWatchers;
-        if (chainWatchers) {
-          for(var key in chainWatchers) {
-            if (!chainWatchers.hasOwnProperty(key)) { continue; }
-            chainNodes = chainWatchers[key];
-            if (chainNodes) {
-              for (var i=0,l=chainNodes.length;i<l;i++) {
-                chainNodes[i].didChange(null);
-              }
-            }
-          }
-        }
-        // copy chains from prototype
-        chains = m.chains;
-        if (chains && chains.value() !== obj) {
+      var m = obj[META_KEY], chains = m && m.chains;
+      if (chains) {
+        if (chains.value() !== obj) {
           metaFor(obj).chains = chains = chains.copy(obj);
+        } else {
+          chains.didChange(null);
         }
       }
     }
@@ -12006,7 +11438,7 @@ enifed("ember-metal/chains",
     __exports__.finishChains = finishChains;__exports__.removeChainWatcher = removeChainWatcher;
     __exports__.ChainNode = ChainNode;
   });
-enifed("ember-metal/computed",
+define("ember-metal/computed",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/expand_properties","ember-metal/error","ember-metal/properties","ember-metal/property_events","ember-metal/dependent_keys","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -12014,6 +11446,7 @@ enifed("ember-metal/computed",
     var get = __dependency2__.get;
     var set = __dependency3__.set;
     var meta = __dependency4__.meta;
+    var META_KEY = __dependency4__.META_KEY;
     var inspect = __dependency4__.inspect;
     var expandProperties = __dependency5__["default"];
     var EmberError = __dependency6__["default"];
@@ -12030,8 +11463,8 @@ enifed("ember-metal/computed",
 
     
 
-    var metaFor = meta;
-    var a_slice = [].slice;
+    var metaFor = meta,
+        a_slice = [].slice;
 
     function UNDEFINED() { }
 
@@ -12363,124 +11796,81 @@ enifed("ember-metal/computed",
       Generally speaking if you intend for your computed property to be set
       your backing function should accept either two or three arguments.
 
-      ```javascript
-      var Person = Ember.Object.extend({
-        // these will be supplied by `create`
-        firstName: null,
-        lastName: null,
-
-        fullName: function(key, value, oldValue) {
-          // getter
-          if (arguments.length === 1) {
-            var firstName = this.get('firstName');
-            var lastName = this.get('lastName');
-
-            return firstName + ' ' + lastName;
-
-          // setter
-          } else {
-            var name = value.split(' ');
-
-            this.set('firstName', name[0]);
-            this.set('lastName', name[1]);
-
-            return value;
-          }
-        }.property('firstName', 'lastName')
-      });
-
-      var person = Person.create();
-
-      person.set('fullName', 'Peter Wagenet');
-      person.get('firstName'); // 'Peter'
-      person.get('lastName');  // 'Wagenet'
-      ```
-
       @method set
       @param {String} keyName The key being accessed.
       @param {Object} newValue The new value being assigned.
       @param {String} oldValue The old value being replaced.
       @return {Object} The return value of the function backing the CP.
     */
-    ComputedPropertyPrototype.set = function computedPropertySetWithSuspend(obj, keyName, value) {
-      var oldSuspended = this._suspended;
-
-      this._suspended = obj;
-
-      try {
-        this._set(obj, keyName, value);
-      } finally {
-        this._suspended = oldSuspended;
-      }
-    };
-
-    ComputedPropertyPrototype._set = function computedPropertySet(obj, keyName, value) {
-      var cacheable      = this._cacheable;
-      var func           = this.func;
-      var meta           = metaFor(obj, cacheable);
-      var cache          = meta.cache;
-      var hadCachedValue = false;
-
-      var funcArgLength, cachedValue, ret;
+    ComputedPropertyPrototype.set = function(obj, keyName, value) {
+      var cacheable = this._cacheable,
+          func = this.func,
+          meta = metaFor(obj, cacheable),
+          oldSuspended = this._suspended,
+          hadCachedValue = false,
+          cache = meta.cache,
+          funcArgLength, cachedValue, ret;
 
       if (this._readOnly) {
         throw new EmberError('Cannot set read-only property "' + keyName + '" on object: ' + inspect(obj));
       }
 
-      if (cacheable && cache[keyName] !== undefined) {
-        if(cache[keyName] !== UNDEFINED) {
-          cachedValue = cache[keyName];
+      this._suspended = obj;
+
+      try {
+
+        if (cacheable && cache[keyName] !== undefined) {
+          if(cache[keyName] !== UNDEFINED) {
+            cachedValue = cache[keyName];
+          }
+
+          hadCachedValue = true;
         }
 
-        hadCachedValue = true;
-      }
+        // Check if the CP has been wrapped. If it has, use the
+        // length from the wrapped function.
 
-      // Check if the CP has been wrapped. If it has, use the
-      // length from the wrapped function.
+        funcArgLength = func.wrappedFunction ? func.wrappedFunction.__ember_arity__ : func.__ember_arity__;
 
-      funcArgLength = func.wrappedFunction ? func.wrappedFunction.__ember_arity__ : func.__ember_arity__;
-
-      // For backwards-compatibility with computed properties
-      // that check for arguments.length === 2 to determine if
-      // they are being get or set, only pass the old cached
-      // value if the computed property opts into a third
-      // argument.
-      if (funcArgLength === 3) {
-        ret = func.call(obj, keyName, value, cachedValue);
-      } else if (funcArgLength === 2) {
-        ret = func.call(obj, keyName, value);
-      } else {
-        defineProperty(obj, keyName, null, cachedValue);
-        set(obj, keyName, value);
-        return;
-      }
-
-      if (hadCachedValue && cachedValue === ret) { return; }
-
-      var watched = meta.watching[keyName];
-      if (watched) {
-        propertyWillChange(obj, keyName);
-      }
-
-      if (hadCachedValue) {
-        cache[keyName] = undefined;
-      }
-
-      if (cacheable) {
-        if (!hadCachedValue) {
-          addDependentKeys(this, obj, keyName, meta);
-        }
-        if (ret === undefined) {
-          cache[keyName] = UNDEFINED;
+        // For backwards-compatibility with computed properties
+        // that check for arguments.length === 2 to determine if
+        // they are being get or set, only pass the old cached
+        // value if the computed property opts into a third
+        // argument.
+        if (funcArgLength === 3) {
+          ret = func.call(obj, keyName, value, cachedValue);
+        } else if (funcArgLength === 2) {
+          ret = func.call(obj, keyName, value);
         } else {
-          cache[keyName] = ret;
+          defineProperty(obj, keyName, null, cachedValue);
+          set(obj, keyName, value);
+          return;
         }
-      }
 
-      if (watched) {
-        propertyDidChange(obj, keyName);
-      }
+        if (hadCachedValue && cachedValue === ret) { return; }
 
+        var watched = meta.watching[keyName];
+        if (watched) { propertyWillChange(obj, keyName); }
+
+        if (hadCachedValue) {
+          cache[keyName] = undefined;
+        }
+
+        if (cacheable) {
+          if (!hadCachedValue) {
+            addDependentKeys(this, obj, keyName, meta);
+          }
+          if (ret === undefined) {
+            cache[keyName] = UNDEFINED;
+          } else {
+            cache[keyName] = ret;
+          }
+        }
+
+        if (watched) { propertyDidChange(obj, keyName); }
+      } finally {
+        this._suspended = oldSuspended;
+      }
       return ret;
     };
 
@@ -12507,45 +11897,9 @@ enifed("ember-metal/computed",
       The function should accept two parameters, key and value. If value is not
       undefined you should set the value first. In either case return the
       current value of the property.
-      
-      A computed property defined in this way might look like this:
-
-      ```js
-      var Person = Ember.Object.extend({
-        firstName: 'Betty',
-        lastName: 'Jones',
-
-        fullName: Ember.computed('firstName', 'lastName', function(key, value) {
-          return this.get('firstName') + ' ' + this.get('lastName');
-        })
-      });
-
-      var client = Person.create();
-
-      client.get('fullName'); // 'Betty Jones'
-      
-      client.set('lastName', 'Fuller');
-      client.get('fullName'); // 'Betty Fuller'
-      ```
-
-      _Note: This is the prefered way to define computed properties when writing third-party
-      libraries that depend on or use Ember, since there is no guarantee that the user
-      will have prototype extensions enabled._
-
-      You might use this method if you disabled
-      [Prototype Extensions](http://emberjs.com/guides/configuring-ember/disabling-prototype-extensions/).
-      The alternative syntax might look like this
-      (if prototype extensions are enabled, which is the default behavior):
-
-      ```js
-      fullName: function () {
-        return this.get('firstName') + ' ' + this.get('lastName');
-      }.property('firstName', 'lastName')
-      ```
 
       @method computed
       @for Ember
-      @param {String} [dependentKeys*] Optional dependent keys that trigger this computed property.
       @param {Function} func The computed property function.
       @return {Ember.ComputedProperty} property descriptor instance
     */
@@ -12584,9 +11938,9 @@ enifed("ember-metal/computed",
       @return {Object} the cached value
     */
     function cacheFor(obj, key) {
-      var meta = obj['__ember_meta__'];
-      var cache = meta && meta.cache;
-      var ret = cache && cache[key];
+      var meta = obj[META_KEY],
+          cache = meta && meta.cache,
+          ret = cache && cache[key];
 
       if (ret === UNDEFINED) { return undefined; }
       return ret;
@@ -12614,7 +11968,7 @@ enifed("ember-metal/computed",
     __exports__.computed = computed;
     __exports__.cacheFor = cacheFor;
   });
-enifed("ember-metal/computed_macros",
+define("ember-metal/computed_macros",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/is_empty","ember-metal/is_none","ember-metal/alias"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
     "use strict";
@@ -12878,7 +12232,7 @@ enifed("ember-metal/computed_macros",
     });
 
     /**
-      A computed property that returns true if the provided dependent property
+      A computed property that returns true if the provied dependent property
       is greater than the provided value.
 
       Example
@@ -12902,7 +12256,7 @@ enifed("ember-metal/computed_macros",
       @param {String} dependentKey
       @param {Number} value
       @return {Ember.ComputedProperty} computed property which returns true if
-      the original value for property is greater than given value.
+      the original value for property is greater then given value.
     */
     registerComputed('gt', function(dependentKey, value) {
       return get(this, dependentKey) > value;
@@ -12995,7 +12349,7 @@ enifed("ember-metal/computed_macros",
       @param {String} dependentKey
       @param {Number} value
       @return {Ember.ComputedProperty} computed property which returns true if
-      the original value for property is less or equal than given value.
+      the original value for property is less or equal then given value.
     */
     registerComputed('lte', function(dependentKey, value) {
       return get(this, dependentKey) <= value;
@@ -13125,7 +12479,7 @@ enifed("ember-metal/computed_macros",
       @for Ember
       @param {String} dependentKey*
       @return {Ember.ComputedProperty} computed property which maps
-      values of all passed in properties to an array.
+      values of all passed properties in to an array.
     */
     registerComputedWithProperties('collect', function(properties) {
       var res = [];
@@ -13205,17 +12559,19 @@ enifed("ember-metal/computed_macros",
       return alias(dependentKey).oneWay();
     };
 
-    /**
-      This is a more semantically meaningful alias of `computed.oneWay`,
-      whose name is somewhat ambiguous as to which direction the data flows.
+    
+      /**
+        This is a more semantically meaningful alias of `computed.oneWay`,
+        whose name is somewhat ambiguous as to which direction the data flows.
 
-      @method computed.reads
-      @for Ember
-      @param {String} dependentKey
-      @return {Ember.ComputedProperty} computed property which creates a
-        one way computed property to the original value for property.
-     */
-    computed.reads = computed.oneWay;
+        @method computed.reads
+        @for Ember
+        @param {String} dependentKey
+        @return {Ember.ComputedProperty} computed property which creates a
+          one way computed property to the original value for property.
+       */
+      computed.reads = computed.oneWay;
+    
 
     /**
       Where `computed.oneWay` provides oneWay bindings, `computed.readOnly` provides
@@ -13279,12 +12635,10 @@ enifed("ember-metal/computed_macros",
       @param {String} defaultPath
       @return {Ember.ComputedProperty} computed property which acts like
       a standard getter and setter, but defaults to the value from `defaultPath`.
-      @deprecated Use `Ember.computed.oneWay` or custom CP with default instead.
     */
     // ES6TODO: computed should have its own export path so you can do import {defaultTo} from computed
     computed.defaultTo = function(defaultPath) {
       return computed(function(key, newValue, cachedValue) {
-        
         if (arguments.length === 1) {
           return get(this, defaultPath);
         }
@@ -13317,7 +12671,7 @@ enifed("ember-metal/computed_macros",
       });
     };
   });
-enifed("ember-metal/core",
+define("ember-metal/core",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -13345,7 +12699,7 @@ enifed("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.8.1
+      @version 1.7.1
     */
 
     if ('undefined' === typeof Ember) {
@@ -13372,10 +12726,10 @@ enifed("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.8.1'
+      @default '1.7.1'
       @static
     */
-    Ember.VERSION = '1.8.1';
+    Ember.VERSION = '1.7.1';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -13532,15 +12886,15 @@ enifed("ember-metal/core",
 
     __exports__["default"] = Ember;
   });
-enifed("ember-metal/dependent_keys",
+define("ember-metal/dependent_keys",
   ["ember-metal/platform","ember-metal/watching","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
-        // Remove "use strict"; from transpiled module until
+        // Remove "use strict"; from transpiled module (in browser builds only) until
     // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
     //
     // REMOVE_USE_STRICT: true
 
-    var o_create = __dependency1__.create;
+    var create = __dependency1__.create;
     var watch = __dependency2__.watch;
     var unwatch = __dependency2__.unwatch;
 
@@ -13548,6 +12902,8 @@ enifed("ember-metal/dependent_keys",
     @module ember-metal
     */
 
+    var o_create = create;
+
     // ..........................................................
     // DEPENDENT KEYS
     //
@@ -13621,68 +12977,7 @@ enifed("ember-metal/dependent_keys",
 
     __exports__.removeDependentKeys = removeDependentKeys;
   });
-enifed("ember-metal/deprecate_property",
-  ["ember-metal/core","ember-metal/platform","ember-metal/properties","ember-metal/property_get","ember-metal/property_set","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
-    "use strict";
-    /**
-    @module ember-metal
-    */
-
-    var Ember = __dependency1__["default"];
-    var hasPropertyAccessors = __dependency2__.hasPropertyAccessors;
-    var defineProperty = __dependency3__.defineProperty;
-    var get = __dependency4__.get;
-    var set = __dependency5__.set;
-
-
-    /**
-      Used internally to allow changing properties in a backwards compatible way, and print a helpful
-      deprecation warning.
-
-      @method deprecateProperty
-      @param {Object} object The object to add the deprecated property to.
-      @param {String} deprecatedKey The property to add (and print deprecation warnings upon accessing).
-      @param {String} newKey The property that will be aliased.
-      @private
-      @since 1.7.0
-    */
-
-    function deprecateProperty(object, deprecatedKey, newKey) {
-      function deprecate() {
-              }
-
-      if (hasPropertyAccessors) {
-        defineProperty(object, deprecatedKey, {
-            configurable: true,
-            enumerable: false,
-            set: function(value) { deprecate(); set(this, newKey, value); },
-            get: function() { deprecate(); return get(this, newKey); }
-        });
-      }
-    }
-
-    __exports__.deprecateProperty = deprecateProperty;
-  });
-enifed("ember-metal/dictionary",
-  ["ember-metal/platform","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var create = __dependency1__.create;
-
-    // the delete is meant to hint at runtimes that this object should remain in
-    // dictionary mode. This is clearly a runtime specific hack, but currently it
-    // appears worthwile in some usecases. Please note, these deletes do increase
-    // the cost of creation dramatically over a plain Object.create. And as this
-    // only makes sense for long-lived dictionaries that aren't instantiated often.
-    __exports__["default"] = function makeDictionary(parent) {
-      var dict = create(parent);
-      dict['_dict'] = null;
-      delete dict['_dict'];
-      return dict;
-    }
-  });
-enifed("ember-metal/enumerable_utils",
+define("ember-metal/enumerable_utils",
   ["ember-metal/array","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -13714,7 +13009,7 @@ enifed("ember-metal/enumerable_utils",
      * @return {Array} An array of mapped values.
      */
     function map(obj, callback, thisArg) {
-      return obj.map ? obj.map(callback, thisArg) : _map.call(obj, callback, thisArg);
+      return obj.map ? obj.map.call(obj, callback, thisArg) : _map.call(obj, callback, thisArg);
     }
 
     __exports__.map = map;/**
@@ -13728,7 +13023,7 @@ enifed("ember-metal/enumerable_utils",
      *
      */
     function forEach(obj, callback, thisArg) {
-      return obj.forEach ? obj.forEach(callback, thisArg) : a_forEach.call(obj, callback, thisArg);
+      return obj.forEach ? obj.forEach.call(obj, callback, thisArg) : a_forEach.call(obj, callback, thisArg);
     }
 
     __exports__.forEach = forEach;/**
@@ -13744,7 +13039,7 @@ enifed("ember-metal/enumerable_utils",
      * @since 1.4.0
      */
     function filter(obj, callback, thisArg) {
-      return obj.filter ? obj.filter(callback, thisArg) : _filter.call(obj, callback, thisArg);
+      return obj.filter ? obj.filter.call(obj, callback, thisArg) : _filter.call(obj, callback, thisArg);
     }
 
     __exports__.filter = filter;/**
@@ -13758,7 +13053,7 @@ enifed("ember-metal/enumerable_utils",
      *
      */
     function indexOf(obj, element, index) {
-      return obj.indexOf ? obj.indexOf(element, index) : _indexOf.call(obj, element, index);
+      return obj.indexOf ? obj.indexOf.call(obj, element, index) : _indexOf.call(obj, element, index);
     }
 
     __exports__.indexOf = indexOf;/**
@@ -13817,13 +13112,9 @@ enifed("ember-metal/enumerable_utils",
     }
 
     __exports__.removeObject = removeObject;function _replace(array, idx, amt, objects) {
-      var args = [].concat(objects);
-      var ret = [];
-      // https://code.google.com/p/chromium/issues/detail?id=56588
-      var size = 60000;
-      var start = idx;
-      var ends = amt;
-      var count, chunk;
+      var args = [].concat(objects), chunk, ret = [],
+          // https://code.google.com/p/chromium/issues/detail?id=56588
+          size = 60000, start = idx, ends = amt, count;
 
       while (args.length) {
         count = ends > size ? size : ends;
@@ -13922,7 +13213,7 @@ enifed("ember-metal/enumerable_utils",
       replace: replace
     };
   });
-enifed("ember-metal/error",
+define("ember-metal/error",
   ["ember-metal/platform","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -13969,7 +13260,7 @@ enifed("ember-metal/error",
 
     __exports__["default"] = EmberError;
   });
-enifed("ember-metal/events",
+define("ember-metal/events",
   ["ember-metal/core","ember-metal/utils","ember-metal/platform","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
         // Remove "use strict"; from transpiled module until
@@ -13982,17 +13273,16 @@ enifed("ember-metal/events",
     */
     var Ember = __dependency1__["default"];
     var meta = __dependency2__.meta;
+    var META_KEY = __dependency2__.META_KEY;
     var tryFinally = __dependency2__.tryFinally;
     var apply = __dependency2__.apply;
     var applyStr = __dependency2__.applyStr;
     var create = __dependency3__.create;
 
-    var a_slice = [].slice;
-    var metaFor = meta;
-
-    /* listener flags */
-    var ONCE = 1;
-    var SUSPENDED = 2;
+    var a_slice = [].slice,
+        metaFor = meta,
+        /* listener flags */
+        ONCE = 1, SUSPENDED = 2;
 
 
     /*
@@ -14027,8 +13317,8 @@ enifed("ember-metal/events",
     }
 
     function actionsFor(obj, eventName) {
-      var meta = metaFor(obj, true);
-      var actions;
+      var meta = metaFor(obj, true),
+          actions;
 
       if (!meta.listeners) { meta.listeners = {}; }
 
@@ -14050,15 +13340,15 @@ enifed("ember-metal/events",
     }
 
     function listenersUnion(obj, eventName, otherActions) {
-      var meta = obj['__ember_meta__'];
-      var actions = meta && meta.listeners && meta.listeners[eventName];
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName];
 
       if (!actions) { return; }
       for (var i = actions.length - 3; i >= 0; i -= 3) {
-        var target = actions[i];
-        var method = actions[i+1];
-        var flags = actions[i+2];
-        var actionIndex = indexOf(otherActions, target, method);
+        var target = actions[i],
+            method = actions[i+1],
+            flags = actions[i+2],
+            actionIndex = indexOf(otherActions, target, method);
 
         if (actionIndex === -1) {
           otherActions.push(target, method, flags);
@@ -14067,16 +13357,16 @@ enifed("ember-metal/events",
     }
 
     __exports__.listenersUnion = listenersUnion;function listenersDiff(obj, eventName, otherActions) {
-      var meta = obj['__ember_meta__'];
-      var actions = meta && meta.listeners && meta.listeners[eventName];
-      var diffActions = [];
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName],
+          diffActions = [];
 
       if (!actions) { return; }
       for (var i = actions.length - 3; i >= 0; i -= 3) {
-        var target = actions[i];
-        var method = actions[i+1];
-        var flags = actions[i+2];
-        var actionIndex = indexOf(otherActions, target, method);
+        var target = actions[i],
+            method = actions[i+1],
+            flags = actions[i+2],
+            actionIndex = indexOf(otherActions, target, method);
 
         if (actionIndex !== -1) { continue; }
 
@@ -14105,9 +13395,9 @@ enifed("ember-metal/events",
         target = null;
       }
 
-      var actions = actionsFor(obj, eventName);
-      var actionIndex = indexOf(actions, target, method);
-      var flags = 0;
+      var actions = actionsFor(obj, eventName),
+          actionIndex = indexOf(actions, target, method),
+          flags = 0;
 
       if (once) flags |= ONCE;
 
@@ -14140,8 +13430,8 @@ enifed("ember-metal/events",
       }
 
       function _removeListener(target, method) {
-        var actions = actionsFor(obj, eventName);
-        var actionIndex = indexOf(actions, target, method);
+        var actions = actionsFor(obj, eventName),
+            actionIndex = indexOf(actions, target, method);
 
         // action doesn't exist, give up silently
         if (actionIndex === -1) { return; }
@@ -14156,8 +13446,8 @@ enifed("ember-metal/events",
       if (method) {
         _removeListener(target, method);
       } else {
-        var meta = obj['__ember_meta__'];
-        var actions = meta && meta.listeners && meta.listeners[eventName];
+        var meta = obj[META_KEY],
+            actions = meta && meta.listeners && meta.listeners[eventName];
 
         if (!actions) { return; }
         for (var i = actions.length - 3; i >= 0; i -= 3) {
@@ -14190,8 +13480,8 @@ enifed("ember-metal/events",
         target = null;
       }
 
-      var actions = actionsFor(obj, eventName);
-      var actionIndex = indexOf(actions, target, method);
+      var actions = actionsFor(obj, eventName),
+          actionIndex = indexOf(actions, target, method);
 
       if (actionIndex !== -1) {
         actions[actionIndex+2] |= SUSPENDED; // mark the action as suspended
@@ -14222,9 +13512,9 @@ enifed("ember-metal/events",
         target = null;
       }
 
-      var suspendedActions = [];
-      var actionsList = [];
-      var eventName, actions, i, l;
+      var suspendedActions = [],
+          actionsList = [],
+          eventName, actions, i, l;
 
       for (i=0, l=eventNames.length; i<l; i++) {
         eventName = eventNames[i];
@@ -14259,7 +13549,7 @@ enifed("ember-metal/events",
       @param obj
     */
     function watchedEvents(obj) {
-      var listeners = obj['__ember_meta__'].listeners, ret = [];
+      var listeners = obj[META_KEY].listeners, ret = [];
 
       if (listeners) {
         for(var eventName in listeners) {
@@ -14290,7 +13580,7 @@ enifed("ember-metal/events",
       }
 
       if (!actions) {
-        var meta = obj['__ember_meta__'];
+        var meta = obj[META_KEY];
         actions = meta && meta.listeners && meta.listeners[eventName];
       }
 
@@ -14327,8 +13617,8 @@ enifed("ember-metal/events",
       @param {String} eventName
     */
     function hasListeners(obj, eventName) {
-      var meta = obj['__ember_meta__'];
-      var actions = meta && meta.listeners && meta.listeners[eventName];
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName];
 
       return !!(actions && actions.length);
     }
@@ -14342,14 +13632,14 @@ enifed("ember-metal/events",
     */
     function listenersFor(obj, eventName) {
       var ret = [];
-      var meta = obj['__ember_meta__'];
-      var actions = meta && meta.listeners && meta.listeners[eventName];
+      var meta = obj[META_KEY],
+          actions = meta && meta.listeners && meta.listeners[eventName];
 
       if (!actions) { return ret; }
 
       for (var i = 0, l = actions.length; i < l; i += 3) {
-        var target = actions[i];
-        var method = actions[i+1];
+        var target = actions[i],
+            method = actions[i+1];
         ret.push([target, method]);
       }
 
@@ -14380,68 +13670,58 @@ enifed("ember-metal/events",
       @return func
     */
     function on(){
-      var func = a_slice.call(arguments, -1)[0];
-      var events = a_slice.call(arguments, 0, -1);
+      var func = a_slice.call(arguments, -1)[0],
+          events = a_slice.call(arguments, 0, -1);
       func.__ember_listens__ = events;
       return func;
     }
 
     __exports__.on = on;__exports__.removeListener = removeListener;
   });
-enifed("ember-metal/expand_properties",
-  ["ember-metal/core","ember-metal/error","ember-metal/enumerable_utils","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+define("ember-metal/expand_properties",
+  ["ember-metal/error","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    var EmberError = __dependency2__["default"];
-    var forEach = __dependency3__.forEach;
+    var EmberError = __dependency1__["default"];
+    var forEach = __dependency2__.forEach;
 
     /**
       @module ember-metal
       */
 
     var BRACE_EXPANSION = /^((?:[^\.]*\.)*)\{(.*)\}$/;
-    var SPLIT_REGEX = /\{|\}/;
 
     /**
       Expands `pattern`, invoking `callback` for each expansion.
 
       The only pattern supported is brace-expansion, anything else will be passed
-      once to `callback` directly.
+      once to `callback` directly. Brace expansion can only appear at the end of a
+      pattern, for an example see the last call below.
 
       Example
-
       ```js
       function echo(arg){ console.log(arg); }
 
-      Ember.expandProperties('foo.bar', echo);              //=> 'foo.bar'
-      Ember.expandProperties('{foo,bar}', echo);            //=> 'foo', 'bar'
-      Ember.expandProperties('foo.{bar,baz}', echo);        //=> 'foo.bar', 'foo.baz'
-      Ember.expandProperties('{foo,bar}.baz', echo);        //=> '{foo,bar}.baz'
-      Ember.expandProperties('foo.{bar,baz}.@each', echo)   //=> 'foo.bar.@each', 'foo.baz.@each'
-      Ember.expandProperties('{foo,bar}.{spam,eggs}', echo) //=> 'foo.spam', 'foo.eggs', 'bar.spam', 'bar.eggs'
-      Ember.expandProperties('{foo}.bar.{baz}')             //=> 'foo.bar.baz'
+      Ember.expandProperties('foo.bar', echo);        //=> 'foo.bar'
+      Ember.expandProperties('{foo,bar}', echo);      //=> 'foo', 'bar'
+      Ember.expandProperties('foo.{bar,baz}', echo);  //=> 'foo.bar', 'foo.baz'
+      Ember.expandProperties('{foo,bar}.baz', echo);  //=> '{foo,bar}.baz'
       ```
 
       @method
       @private
-      @param {String} pattern The property pattern to expand.
-      @param {Function} callback The callback to invoke.  It is invoked once per
+      @param {string} pattern The property pattern to expand.
+      @param {function} callback The callback to invoke.  It is invoked once per
       expansion, and is passed the expansion.
       */
     __exports__["default"] = function expandProperties(pattern, callback) {
+      var match, prefix, list;
+
       if (pattern.indexOf(' ') > -1) {
-        throw new EmberError('Brace expanded properties cannot contain spaces, ' +
+        throw new EmberError('Brace expanded properties cannot contain spaces, ' + 
           'e.g. `user.{firstName, lastName}` should be `user.{firstName,lastName}`');
       }
 
-      
-        return newExpandProperties(pattern, callback);
-          }
-
-    function oldExpandProperties(pattern, callback) {
-      var match, prefix, list;
-
       if (match = BRACE_EXPANSION.exec(pattern)) {
         prefix = match[1];
         list = match[2];
@@ -14453,41 +13733,8 @@ enifed("ember-metal/expand_properties",
         callback(pattern);
       }
     }
-
-    function newExpandProperties(pattern, callback) {
-      if ('string' === Ember.typeOf(pattern)) {
-        var parts = pattern.split(SPLIT_REGEX);
-        var properties = [parts];
-
-        forEach(parts, function(part, index) {
-          if (part.indexOf(',') >= 0) {
-            properties = duplicateAndReplace(properties, part.split(','), index);
-          }
-        });
-
-        forEach(properties, function(property) {
-          callback(property.join(''));
-        });
-      } else {
-        callback(pattern);
-      }
-    }
-
-    function duplicateAndReplace(properties, currentParts, index) {
-      var all = [];
-
-      forEach(properties, function(property) {
-        forEach(currentParts, function(part) {
-          var current = property.slice(0);
-          current[index] = part;
-          all.push(current);
-        });
-      });
-
-      return all;
-    }
   });
-enifed("ember-metal/get_properties",
+define("ember-metal/get_properties",
   ["ember-metal/property_get","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -14516,9 +13763,9 @@ enifed("ember-metal/get_properties",
       @return {Hash}
     */
     __exports__["default"] = function getProperties(obj) {
-      var ret = {};
-      var propertyNames = arguments;
-      var i = 1;
+      var ret = {},
+          propertyNames = arguments,
+          i = 1;
 
       if (arguments.length === 2 && typeOf(arguments[1]) === 'array') {
         i = 0;
@@ -14530,7 +13777,7 @@ enifed("ember-metal/get_properties",
       return ret;
     }
   });
-enifed("ember-metal/instrumentation",
+define("ember-metal/instrumentation",
   ["ember-metal/core","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -14583,12 +13830,10 @@ enifed("ember-metal/instrumentation",
       @namespace Ember
       @static
     */
-    var subscribers = [];
-    __exports__.subscribers = subscribers;var cache = {};
+    var subscribers = [], cache = {};
 
     var populateListeners = function(name) {
-      var listeners = [];
-      var subscriber;
+      var listeners = [], subscriber;
 
       for (var i=0, l=subscribers.length; i<l; i++) {
         subscriber = subscribers[i];
@@ -14619,72 +13864,56 @@ enifed("ember-metal/instrumentation",
       @param {Function} callback Function that you're instrumenting.
       @param {Object} binding Context that instrument function is called with.
     */
-    function instrument(name, _payload, callback, binding) {
-      if (subscribers.length === 0) {
-        return callback.call(binding);
-      }
-      var payload = _payload || {};
-      var finalizer = _instrumentStart(name, function () {
-        return payload;
-      });
-      if (finalizer) {
-        var tryable = function _instrumenTryable() {
-          return callback.call(binding);
-        };
-        var catchable = function _instrumentCatchable(e) {
-          payload.exception = e;
-        };
-        return tryCatchFinally(tryable, catchable, finalizer);
-      } else {
-        return callback.call(binding);
-      }
-    }
+    function instrument(name, payload, callback, binding) {
+      var listeners = cache[name], timeName, ret;
 
-    __exports__.instrument = instrument;// private for now
-    function _instrumentStart(name, _payload) {
-      var listeners = cache[name];
+      // ES6TODO: Docs. What is this?
+      if (Ember.STRUCTURED_PROFILE) {
+        timeName = name + ": " + payload.object;
+        console.time(timeName);
+      }
 
       if (!listeners) {
         listeners = populateListeners(name);
       }
 
       if (listeners.length === 0) {
-        return;
+        ret = callback.call(binding);
+        if (Ember.STRUCTURED_PROFILE) { console.timeEnd(timeName); }
+        return ret;
       }
 
-      var payload = _payload();
+      var beforeValues = [], listener, i, l;
 
-      var STRUCTURED_PROFILE = Ember.STRUCTURED_PROFILE;
-      var timeName;
-      if (STRUCTURED_PROFILE) {
-        timeName = name + ": " + payload.object;
-        console.time(timeName);
-      }
-
-      var l = listeners.length;
-      var beforeValues = new Array(l);
-      var i, listener;
-      var timestamp = time();
-      for (i=0; i<l; i++) {
-        listener = listeners[i];
-        beforeValues[i] = listener.before(name, timestamp, payload);
-      }
-
-      return function _instrumentEnd() {
-        var i, l, listener;
-        var timestamp = time();
+      function tryable() {
         for (i=0, l=listeners.length; i<l; i++) {
           listener = listeners[i];
-          listener.after(name, timestamp, payload, beforeValues[i]);
+          beforeValues[i] = listener.before(name, time(), payload);
         }
 
-        if (STRUCTURED_PROFILE) {
+        return callback.call(binding);
+      }
+
+      function catchable(e) {
+        payload = payload || {};
+        payload.exception = e;
+      }
+
+      function finalizer() {
+        for (i=0, l=listeners.length; i<l; i++) {
+          listener = listeners[i];
+          listener.after(name, time(), payload, beforeValues[i]);
+        }
+
+        if (Ember.STRUCTURED_PROFILE) {
           console.timeEnd(timeName);
         }
-      };
+      }
+
+      return tryCatchFinally(tryable, catchable, finalizer);
     }
 
-    __exports__._instrumentStart = _instrumentStart;/**
+    __exports__.instrument = instrument;/**
       Subscribes to a particular event or instrumented block of code.
 
       @method subscribe
@@ -14750,13 +13979,13 @@ enifed("ember-metal/instrumentation",
       @namespace Ember.Instrumentation
     */
     function reset() {
-      subscribers.length = 0;
+      subscribers = [];
       cache = {};
     }
 
     __exports__.reset = reset;
   });
-enifed("ember-metal/is_blank",
+define("ember-metal/is_blank",
   ["ember-metal/core","ember-metal/is_empty","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -14791,7 +14020,7 @@ enifed("ember-metal/is_blank",
       return isEmpty(obj) || (typeof obj === 'string' && obj.match(/\S/) === null);
     }
   });
-enifed("ember-metal/is_empty",
+define("ember-metal/is_empty",
   ["ember-metal/core","ember-metal/property_get","ember-metal/is_none","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -14804,7 +14033,7 @@ enifed("ember-metal/is_empty",
       Verifies that a value is `null` or an empty string, empty array,
       or empty function.
 
-      Constrains the rules on `Ember.isNone` by returning true for empty
+      Constrains the rules on `Ember.isNone` by returning false for empty
       string and empty arrays.
 
       ```javascript
@@ -14823,36 +14052,7 @@ enifed("ember-metal/is_empty",
       @return {Boolean}
     */
     function isEmpty(obj) {
-      var none = isNone(obj);
-      if (none) {
-        return none;
-      }
-
-      if (typeof obj.size === 'number') {
-        return !obj.size;
-      }
-
-      var objectType = typeof obj;
-
-      if (objectType === 'object') {
-        var size = get(obj, 'size');
-        if (typeof size === 'number') {
-          return !size;
-        }
-      }
-
-      if (typeof obj.length === 'number' && objectType !== 'function') {
-        return !obj.length;
-      }
-
-      if (objectType === 'object') {
-        var length = get(obj, 'length');
-        if (typeof length === 'number') {
-          return !length;
-        }
-      }
-
-      return false;
+      return isNone(obj) || (obj.length === 0 && typeof obj !== 'function') || (typeof obj === 'object' && get(obj, 'length') === 0);
     }
 
     var empty = Ember.deprecateFunc("Ember.empty is deprecated. Please use Ember.isEmpty instead.", isEmpty);
@@ -14861,7 +14061,7 @@ enifed("ember-metal/is_empty",
     __exports__.isEmpty = isEmpty;
     __exports__.empty = empty;
   });
-enifed("ember-metal/is_none",
+define("ember-metal/is_none",
   ["ember-metal/core","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -14896,109 +14096,7 @@ enifed("ember-metal/is_none",
     __exports__["default"] = isNone;
     __exports__.isNone = isNone;
   });
-enifed("ember-metal/is_present",
-  ["ember-metal/is_blank","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var isBlank = __dependency1__["default"];
-    var isPresent;
-
-    
-      /**
-        A value is present if it not `isBlank`.
-
-        ```javascript
-        Ember.isPresent();                // false
-        Ember.isPresent(null);            // false
-        Ember.isPresent(undefined);       // false
-        Ember.isPresent('');              // false
-        Ember.isPresent([]);              // false
-        Ember.isPresent('\n\t');          // false
-        Ember.isPresent('  ');            // false
-        Ember.isPresent({});              // true
-        Ember.isPresent('\n\t Hello');    // true
-        Ember.isPresent('Hello world');   // true
-        Ember.isPresent([1,2,3]);         // true
-        ```
-
-        @method isPresent
-        @for Ember
-        @param {Object} obj Value to test
-        @return {Boolean}
-        @since 1.7.0
-        */
-      isPresent = function isPresent(obj) {
-        return !isBlank(obj);
-      };
-    
-
-    __exports__["default"] = isPresent;
-  });
-enifed("ember-metal/keys",
-  ["ember-metal/platform","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var canDefineNonEnumerableProperties = __dependency1__.canDefineNonEnumerableProperties;
-
-    /**
-      Returns all of the keys defined on an object or hash. This is useful
-      when inspecting objects for debugging. On browsers that support it, this
-      uses the native `Object.keys` implementation.
-
-      @method keys
-      @for Ember
-      @param {Object} obj
-      @return {Array} Array containing keys of obj
-    */
-    var keys = Object.keys;
-
-    if (!keys || !canDefineNonEnumerableProperties) {
-      // modified from
-      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys
-      keys = (function () {
-        var hasOwnProperty = Object.prototype.hasOwnProperty,
-            hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'),
-            dontEnums = [
-              'toString',
-              'toLocaleString',
-              'valueOf',
-              'hasOwnProperty',
-              'isPrototypeOf',
-              'propertyIsEnumerable',
-              'constructor'
-            ],
-            dontEnumsLength = dontEnums.length;
-
-        return function keys(obj) {
-          if (typeof obj !== 'object' && (typeof obj !== 'function' || obj === null)) {
-            throw new TypeError('Object.keys called on non-object');
-          }
-
-          var result = [], prop, i;
-
-          for (prop in obj) {
-            if (prop !== '_super' &&
-              prop.lastIndexOf('__',0) !== 0 &&
-              hasOwnProperty.call(obj, prop)) {
-              result.push(prop);
-            }
-          }
-
-          if (hasDontEnumBug) {
-            for (i = 0; i < dontEnumsLength; i++) {
-              if (hasOwnProperty.call(obj, dontEnums[i])) {
-                result.push(dontEnums[i]);
-              }
-            }
-          }
-          return result;
-        };
-      }());
-    }
-
-    __exports__["default"] = keys;
-  });
-enifed("ember-metal/libraries",
+define("ember-metal/libraries",
   ["ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -15046,7 +14144,7 @@ enifed("ember-metal/libraries",
 
     __exports__["default"] = libraries;
   });
-enifed("ember-metal/logger",
+define("ember-metal/logger",
   ["ember-metal/core","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -15194,8 +14292,8 @@ enifed("ember-metal/logger",
       assert: consoleMethod('assert') || assertPolyfill
     };
   });
-enifed("ember-metal/map",
-  ["ember-metal/utils","ember-metal/array","ember-metal/platform","ember-metal/deprecate_property","exports"],
+define("ember-metal/map",
+  ["ember-metal/property_set","ember-metal/utils","ember-metal/array","ember-metal/platform","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
@@ -15213,44 +14311,37 @@ enifed("ember-metal/map",
 
       This implementation follows the current iteration of the ES6 proposal for
       maps (http://wiki.ecmascript.org/doku.php?id=harmony:simple_maps_and_sets),
-      with one exception:  as we do not have the luxury of in-VM iteration, we implement a
+      with two exceptions. First, because we need our implementation to be pleasant
+      on older browsers, we do not use the `delete` name (using `remove` instead).
+      Second, as we do not have the luxury of in-VM iteration, we implement a
       forEach method for iteration.
 
       Map is mocked out to look like an Ember object, so you can do
       `Ember.Map.create()` for symmetry with other Ember classes.
     */
 
-    var guidFor = __dependency1__.guidFor;
-    var indexOf = __dependency2__.indexOf;
-    var create = __dependency3__.create;
-    var deprecateProperty = __dependency4__.deprecateProperty;
+    var set = __dependency1__.set;
+    var guidFor = __dependency2__.guidFor;
+    var indexOf = __dependency3__.indexOf;
+    var create = __dependency4__.create;
 
-    function missingFunction(fn) {
-      throw new TypeError('' + Object.prototype.toString.call(fn) + " is not a function");
-    }
-
-    function missingNew(name) {
-      throw new TypeError("Constructor " + name + "requires 'new'");
-    }
-
-    function copyNull(obj) {
-      var output = create(null);
+    function copy(obj) {
+      var output = {};
 
       for (var prop in obj) {
-        // hasOwnPropery is not needed because obj is Object.create(null);
-        output[prop] = obj[prop];
+        if (obj.hasOwnProperty(prop)) { output[prop] = obj[prop]; }
       }
 
       return output;
     }
 
     function copyMap(original, newObject) {
-      var keys = original.keys.copy();
-      var values = copyNull(original.values);
+      var keys = original.keys.copy(),
+          values = copy(original.values);
 
       newObject.keys = keys;
       newObject.values = values;
-      newObject.size = original.size;
+      newObject.length = original.length;
 
       return newObject;
     }
@@ -15266,13 +14357,7 @@ enifed("ember-metal/map",
       @private
     */
     function OrderedSet() {
-
-      if (this instanceof OrderedSet) {
-        this.clear();
-        this._silenceRemoveDeprecation = false;
-      } else {
-        missingNew("OrderedSet");
-      }
+      this.clear();
     }
 
     /**
@@ -15281,77 +14366,48 @@ enifed("ember-metal/map",
       @return {Ember.OrderedSet}
     */
     OrderedSet.create = function() {
-      var Constructor = this;
-
-      return new Constructor();
+      return new OrderedSet();
     };
 
+
     OrderedSet.prototype = {
-      constructor: OrderedSet,
       /**
         @method clear
       */
       clear: function() {
-        this.presenceSet = create(null);
+        this.presenceSet = {};
         this.list = [];
-        this.size = 0;
       },
 
       /**
         @method add
         @param obj
-        @param guid (optional, and for internal use)
-        @return {Ember.OrderedSet}
       */
-      add: function(obj, _guid) {
-        var guid = _guid || guidFor(obj);
-        var presenceSet = this.presenceSet;
-        var list = this.list;
+      add: function(obj) {
+        var guid = guidFor(obj),
+            presenceSet = this.presenceSet,
+            list = this.list;
 
-        if (presenceSet[guid] === true) {
-          return;
-        }
+        if (guid in presenceSet) { return; }
 
         presenceSet[guid] = true;
-        this.size = list.push(obj);
-
-        return this;
+        list.push(obj);
       },
 
       /**
-        @deprecated
-
         @method remove
         @param obj
-        @param _guid (optional and for internal use only)
-        @return {Boolean}
       */
-      remove: function(obj, _guid) {
-        
-        return this["delete"](obj, _guid);
-      },
+      remove: function(obj) {
+        var guid = guidFor(obj),
+            presenceSet = this.presenceSet,
+            list = this.list;
 
-      /**
-        @method delete
-        @param obj
-        @param _guid (optional and for internal use only)
-        @return {Boolean}
-      */
-      "delete": function(obj, _guid) {
-        var guid = _guid || guidFor(obj);
-        var presenceSet = this.presenceSet;
-        var list = this.list;
+        delete presenceSet[guid];
 
-        if (presenceSet[guid] === true) {
-          delete presenceSet[guid];
-          var index = indexOf.call(list, obj);
-          if (index > -1) {
-            list.splice(index, 1);
-          }
-          this.size = list.length;
-          return true;
-        } else {
-          return false;
+        var index = indexOf.call(list, obj);
+        if (index > -1) {
+          list.splice(index, 1);
         }
       },
 
@@ -15360,7 +14416,7 @@ enifed("ember-metal/map",
         @return {Boolean}
       */
       isEmpty: function() {
-        return this.size === 0;
+        return this.list.length === 0;
       },
 
       /**
@@ -15369,12 +14425,10 @@ enifed("ember-metal/map",
         @return {Boolean}
       */
       has: function(obj) {
-        if (this.size === 0) { return false; }
+        var guid = guidFor(obj),
+            presenceSet = this.presenceSet;
 
-        var guid = guidFor(obj);
-        var presenceSet = this.presenceSet;
-
-        return presenceSet[guid] === true;
+        return guid in presenceSet;
       },
 
       /**
@@ -15382,25 +14436,12 @@ enifed("ember-metal/map",
         @param {Function} fn
         @param self
       */
-      forEach: function(fn /*, thisArg*/) {
-        if (typeof fn !== 'function') {
-          missingFunction(fn);
-        }
+      forEach: function(fn, self) {
+        // allow mutation during iteration
+        var list = this.toArray();
 
-        if (this.size === 0) { return; }
-
-        var list = this.list;
-        var length = arguments.length;
-        var i;
-
-        if (length === 2) {
-          for (i = 0; i < list.length; i++) {
-            fn.call(arguments[1], list[i]);
-          }
-        } else {
-          for (i = 0; i < list.length; i++) {
-            fn(list[i]);
-          }
+        for (var i = 0, j = list.length; i < j; i++) {
+          fn.call(self, list[i]);
         }
       },
 
@@ -15417,20 +14458,15 @@ enifed("ember-metal/map",
         @return {Ember.OrderedSet}
       */
       copy: function() {
-        var Constructor = this.constructor;
-        var set = new Constructor();
+        var set = new OrderedSet();
 
-        set._silenceRemoveDeprecation = this._silenceRemoveDeprecation;
-        set.presenceSet = copyNull(this.presenceSet);
+        set.presenceSet = copy(this.presenceSet);
         set.list = this.toArray();
-        set.size = this.size;
 
         return set;
       }
     };
 
-    deprecateProperty(OrderedSet.prototype, 'length', 'size');
-
     /**
       A Map stores values indexed by keys. Unlike JavaScript's
       default Objects, the keys of a Map can be any JavaScript
@@ -15452,14 +14488,8 @@ enifed("ember-metal/map",
       @constructor
     */
     function Map() {
-      if (this instanceof this.constructor) {
-        this.keys = OrderedSet.create();
-        this.keys._silenceRemoveDeprecation = true;
-        this.values = create(null);
-        this.size = 0;
-      } else {
-        missingNew("OrderedSet");
-      }
+      this.keys = OrderedSet.create();
+      this.values = {};
     }
 
     Ember.Map = Map;
@@ -15469,21 +14499,18 @@ enifed("ember-metal/map",
       @static
     */
     Map.create = function() {
-      var Constructor = this;
-      return new Constructor();
+      return new Map();
     };
 
     Map.prototype = {
-      constructor: Map,
-
       /**
         This property will change as the number of objects in the map changes.
 
-        @property size
+        @property length
         @type number
         @default 0
       */
-      size: 0,
+      length: 0,
 
       /**
         Retrieve the value associated with a given key.
@@ -15493,10 +14520,8 @@ enifed("ember-metal/map",
         @return {*} the value associated with the key, or `undefined`
       */
       get: function(key) {
-        if (this.size === 0) { return; }
-
-        var values = this.values;
-        var guid = guidFor(key);
+        var values = this.values,
+            guid = guidFor(key);
 
         return values[guid];
       },
@@ -15508,27 +14533,18 @@ enifed("ember-metal/map",
         @method set
         @param {*} key
         @param {*} value
-        @return {Ember.Map}
       */
       set: function(key, value) {
-        var keys = this.keys;
-        var values = this.values;
-        var guid = guidFor(key);
-
-        // ensure we don't store -0
-        var k = key === -0 ? 0 : key;
-
-        keys.add(k, guid);
+        var keys = this.keys,
+            values = this.values,
+            guid = guidFor(key);
 
+        keys.add(key);
         values[guid] = value;
-
-        this.size = keys.size;
-
-        return this;
+        set(this, 'length', keys.list.length);
       },
 
       /**
-        @deprecated see delete
         Removes a value from the map for an associated key.
 
         @method remove
@@ -15536,28 +14552,16 @@ enifed("ember-metal/map",
         @return {Boolean} true if an item was removed, false otherwise
       */
       remove: function(key) {
-        
-        return this["delete"](key);
-      },
-
-      /**
-        Removes a value from the map for an associated key.
-
-        @method delete
-        @param {*} key
-        @return {Boolean} true if an item was removed, false otherwise
-      */
-      "delete": function(key) {
-        if (this.size === 0) { return false; }
         // don't use ES6 "delete" because it will be annoying
         // to use in browsers that are not ES6 friendly;
-        var keys = this.keys;
-        var values = this.values;
-        var guid = guidFor(key);
+        var keys = this.keys,
+            values = this.values,
+            guid = guidFor(key);
 
-        if (keys["delete"](key, guid)) {
+        if (values.hasOwnProperty(guid)) {
+          keys.remove(key);
           delete values[guid];
-          this.size = keys.size;
+          set(this, 'length', keys.list.length);
           return true;
         } else {
           return false;
@@ -15572,7 +14576,10 @@ enifed("ember-metal/map",
         @return {Boolean} true if the item was present, false otherwise
       */
       has: function(key) {
-        return this.keys.has(key);
+        var values = this.values,
+            guid = guidFor(key);
+
+        return values.hasOwnProperty(guid);
       },
 
       /**
@@ -15586,38 +14593,14 @@ enifed("ember-metal/map",
         @param {*} self if passed, the `this` value inside the
           callback. By default, `this` is the map.
       */
-      forEach: function(callback /*, thisArg*/) {
-        if (typeof callback !== 'function') {
-          missingFunction(callback);
-        }
+      forEach: function(callback, self) {
+        var keys = this.keys,
+            values = this.values;
 
-        if (this.size === 0) { return; }
-
-        var length = arguments.length;
-        var map = this;
-        var cb, thisArg;
-
-        if (length === 2) {
-          thisArg = arguments[1];
-          cb = function(key) {
-            callback.call(thisArg, map.get(key), key);
-          };
-        } else {
-          cb = function(key) {
-            callback(map.get(key), key);
-          };
-        }
-
-        this.keys.forEach(cb);
-      },
-
-      /**
-        @method clear
-      */
-      clear: function() {
-        this.keys.clear();
-        this.values = create(null);
-        this.size = 0;
+        keys.forEach(function(key) {
+          var guid = guidFor(key);
+          callback.call(self, key, values[guid]);
+        });
       },
 
       /**
@@ -15629,8 +14612,6 @@ enifed("ember-metal/map",
       }
     };
 
-    deprecateProperty(Map.prototype, 'length', 'size');
-
     /**
       @class MapWithDefault
       @namespace Ember
@@ -15641,7 +14622,7 @@ enifed("ember-metal/map",
         @param {*} [options.defaultValue]
     */
     function MapWithDefault(options) {
-      this._super$constructor();
+      Map.call(this);
       this.defaultValue = options.defaultValue;
     }
 
@@ -15662,9 +14643,6 @@ enifed("ember-metal/map",
     };
 
     MapWithDefault.prototype = create(Map.prototype);
-    MapWithDefault.prototype.constructor = MapWithDefault;
-    MapWithDefault.prototype._super$constructor = Map;
-    MapWithDefault.prototype._super$get = Map.prototype.get;
 
     /**
       Retrieve the value associated with a given key.
@@ -15677,7 +14655,7 @@ enifed("ember-metal/map",
       var hasValue = this.has(key);
 
       if (hasValue) {
-        return this._super$get(key);
+        return Map.prototype.get.call(this, key);
       } else {
         var defaultValue = this.defaultValue(key);
         this.set(key, defaultValue);
@@ -15690,24 +14668,19 @@ enifed("ember-metal/map",
       @return {Ember.MapWithDefault}
     */
     MapWithDefault.prototype.copy = function() {
-      var Constructor = this.constructor;
-      return copyMap(this, new Constructor({
+      return copyMap(this, new MapWithDefault({
         defaultValue: this.defaultValue
       }));
     };
 
-    __exports__["default"] = Map;
-
     __exports__.OrderedSet = OrderedSet;
     __exports__.Map = Map;
     __exports__.MapWithDefault = MapWithDefault;
   });
-enifed("ember-metal/merge",
-  ["ember-metal/keys","exports"],
-  function(__dependency1__, __exports__) {
+define("ember-metal/merge",
+  ["exports"],
+  function(__exports__) {
     "use strict";
-    var keys = __dependency1__["default"];
-
     /**
       Merge the contents of two objects together into the first object.
 
@@ -15724,23 +14697,14 @@ enifed("ember-metal/merge",
       @return {Object}
     */
     __exports__["default"] = function merge(original, updates) {
-      if (!updates || typeof updates !== 'object') { 
-        return original;
-      }
-
-      var props = keys(updates);
-      var prop;
-      var length = props.length;
-
-      for (var i = 0; i < length; i++) {
-        prop = props[i];
+      for (var prop in updates) {
+        if (!updates.hasOwnProperty(prop)) { continue; }
         original[prop] = updates[prop];
       }
-
       return original;
     }
   });
-enifed("ember-metal/mixin",
+define("ember-metal/mixin",
   ["ember-metal/core","ember-metal/merge","ember-metal/array","ember-metal/platform","ember-metal/utils","ember-metal/expand_properties","ember-metal/properties","ember-metal/computed","ember-metal/binding","ember-metal/observer","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
         // Remove "use strict"; from transpiled module until
@@ -15762,10 +14726,10 @@ enifed("ember-metal/mixin",
     var create = __dependency4__.create;
     var guidFor = __dependency5__.guidFor;
     var meta = __dependency5__.meta;
+    var META_KEY = __dependency5__.META_KEY;
     var wrap = __dependency5__.wrap;
     var makeArray = __dependency5__.makeArray;
     var apply = __dependency5__.apply;
-    var isArray = __dependency5__.isArray;
     var expandProperties = __dependency6__["default"];
     var Descriptor = __dependency7__.Descriptor;
     var defineProperty = __dependency7__.defineProperty;
@@ -15778,32 +14742,26 @@ enifed("ember-metal/mixin",
     var addListener = __dependency11__.addListener;
     var removeListener = __dependency11__.removeListener;
 
-    var REQUIRED;
-    var a_map = map;
-    var a_indexOf = indexOf;
-    var a_forEach = forEach;
-    var a_slice = [].slice;
-    var o_create = create;
-    var metaFor = meta;
+    var REQUIRED,
+        a_map = map,
+        a_indexOf = indexOf,
+        a_forEach = forEach,
+        a_slice = [].slice,
+        o_create = create,
+        metaFor = meta;
 
     function superFunction(){
-      var func = this.__nextSuper;
-      var ret;
+      var ret, func = this.__nextSuper;
       if (func) {
-        var args = new Array(arguments.length);
-        for (var i = 0, l = args.length; i < l; i++) {
-          args[i] = arguments[i];
-        }
         this.__nextSuper = null;
-        ret = apply(this, func, args);
+        ret = apply(this, func, arguments);
         this.__nextSuper = func;
       }
       return ret;
     }
 
     function mixinsMeta(obj) {
-      var m = metaFor(obj, true);
-      var ret = m.mixins;
+      var m = metaFor(obj, true), ret = m.mixins;
       if (!ret) {
         ret = m.mixins = {};
       } else if (!m.hasOwnProperty('mixins')) {
@@ -15874,7 +14832,7 @@ enifed("ember-metal/mixin",
       // it on the original object.
       superProperty = superProperty || meta.descs[key];
 
-      if (superProperty === undefined || !(superProperty instanceof ComputedProperty)) {
+      if (!superProperty || !(superProperty instanceof ComputedProperty)) {
         return property;
       }
 
@@ -15901,7 +14859,7 @@ enifed("ember-metal/mixin",
       superMethod = superMethod || obj[key];
 
       // Only wrap the new method if the original method was a function
-      if (superMethod === undefined || 'function' !== typeof superMethod) {
+      if ('function' !== typeof superMethod) {
         return method;
       }
 
@@ -15925,11 +14883,10 @@ enifed("ember-metal/mixin",
     function applyMergedProperties(obj, key, value, values) {
       var baseValue = values[key] || obj[key];
 
-      
       if (!baseValue) { return value; }
 
-      var newBase = merge({}, baseValue);
-      var hasFunction = false;
+      var newBase = merge({}, baseValue),
+          hasFunction = false;
 
       for (var prop in value) {
         if (!value.hasOwnProperty(prop)) { continue; }
@@ -16030,8 +14987,7 @@ enifed("ember-metal/mixin",
 
     function connectBindings(obj, m) {
       // TODO Mixin.apply(instance) should disconnect binding if exists
-      var bindings = m.bindings;
-      var key, binding, to;
+      var bindings = m.bindings, key, binding, to;
       if (bindings) {
         for (key in bindings) {
           binding = bindings[key];
@@ -16058,8 +15014,7 @@ enifed("ember-metal/mixin",
     }
 
     function followAlias(obj, desc, m, descs, values) {
-      var altKey = desc.methodName;
-      var value;
+      var altKey = desc.methodName, value;
       if (descs[altKey] || values[altKey]) {
         value = values[altKey];
         desc  = descs[altKey];
@@ -16101,11 +15056,8 @@ enifed("ember-metal/mixin",
     }
 
     function applyMixin(obj, mixins, partial) {
-      var descs = {};
-      var values = {};
-      var m = metaFor(obj);
-      var keys = [];
-      var key, value, desc;
+      var descs = {}, values = {}, m = metaFor(obj),
+          key, value, desc, keys = [];
 
       obj._super = superFunction;
 
@@ -16264,9 +15216,7 @@ enifed("ember-metal/mixin",
         this.mixins = [];
       }
 
-      var len = arguments.length;
-      var mixins = this.mixins;
-      var idx;
+      var len = arguments.length, mixins = this.mixins, idx;
 
       for(idx=0; idx < len; idx++) {
         mixin = arguments[idx];
@@ -16303,8 +15253,7 @@ enifed("ember-metal/mixin",
       seen[guid] = true;
 
       if (curMixin === targetMixin) { return true; }
-      var mixins = curMixin.mixins;
-      var loc = mixins ? mixins.length : 0;
+      var mixins = curMixin.mixins, loc = mixins ? mixins.length : 0;
       while (--loc >= 0) {
         if (_detect(mixins[loc], targetMixin, seen)) { return true; }
       }
@@ -16319,8 +15268,8 @@ enifed("ember-metal/mixin",
     MixinPrototype.detect = function(obj) {
       if (!obj) { return false; }
       if (obj instanceof Mixin) { return _detect(obj, this, {}); }
-      var m = obj['__ember_meta__'];
-      var mixins = m && m.mixins;
+      var m = obj[META_KEY],
+          mixins = m && m.mixins;
       if (mixins) {
         return !!mixins[guidFor(this)];
       }
@@ -16348,9 +15297,7 @@ enifed("ember-metal/mixin",
     }
 
     MixinPrototype.keys = function() {
-      var keys = {};
-      var seen = {};
-      var ret = [];
+      var keys = {}, seen = {}, ret = [];
       _keys(keys, this, seen);
       for(var key in keys) {
         if (keys.hasOwnProperty(key)) { ret.push(key); }
@@ -16361,9 +15308,8 @@ enifed("ember-metal/mixin",
     // returns the mixins currently applied to the specified object
     // TODO: Make Ember.mixin
     Mixin.mixins = function(obj) {
-      var m = obj['__ember_meta__'];
-      var mixins = m && m.mixins;
-      var ret = [];
+      var m = obj[META_KEY],
+          mixins = m && m.mixins, ret = [];
 
       if (!mixins) { return ret; }
 
@@ -16408,7 +15354,7 @@ enifed("ember-metal/mixin",
       });
 
       var goodGuy = App.Person.create();
-
+      
       goodGuy.name();    // 'Tomhuda Katzdale'
       goodGuy.moniker(); // 'Tomhuda Katzdale'
       ```
@@ -16582,7 +15528,7 @@ enifed("ember-metal/mixin",
     __exports__.beforeObserver = beforeObserver;__exports__.IS_BINDING = IS_BINDING;
     __exports__.Mixin = Mixin;
   });
-enifed("ember-metal/observer",
+define("ember-metal/observer",
   ["ember-metal/watching","ember-metal/array","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -16701,7 +15647,7 @@ enifed("ember-metal/observer",
 
     __exports__.removeBeforeObserver = removeBeforeObserver;
   });
-enifed("ember-metal/observer_set",
+define("ember-metal/observer_set",
   ["ember-metal/utils","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -16733,11 +15679,11 @@ enifed("ember-metal/observer_set",
 
 
     ObserverSet.prototype.add = function(sender, keyName, eventName) {
-      var observerSet = this.observerSet;
-      var observers = this.observers;
-      var senderGuid = guidFor(sender);
-      var keySet = observerSet[senderGuid];
-      var index;
+      var observerSet = this.observerSet,
+          observers = this.observers,
+          senderGuid = guidFor(sender),
+          keySet = observerSet[senderGuid],
+          index;
 
       if (!keySet) {
         observerSet[senderGuid] = keySet = {};
@@ -16756,8 +15702,7 @@ enifed("ember-metal/observer_set",
     };
 
     ObserverSet.prototype.flush = function() {
-      var observers = this.observers;
-      var i, len, observer, sender;
+      var observers = this.observers, i, len, observer, sender;
       this.clear();
       for (i=0, len=observers.length; i < len; ++i) {
         observer = observers[i];
@@ -16772,62 +15717,22 @@ enifed("ember-metal/observer_set",
       this.observers = [];
     };
   });
-enifed("ember-metal/path_cache",
-  ["ember-metal/cache","exports"],
+define("ember-metal/platform",
+  ["ember-metal/core","exports"],
   function(__dependency1__, __exports__) {
-    "use strict";
-    var Cache = __dependency1__["default"];
+        // Remove "use strict"; from transpiled module (in browser builds only) until
+    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+    //
+    // REMOVE_USE_STRICT: true
 
-    var IS_GLOBAL      = /^([A-Z$]|([0-9][A-Z$]))/;
-    var IS_GLOBAL_PATH = /^([A-Z$]|([0-9][A-Z$])).*[\.]/;
-    var HAS_THIS       = 'this.';
+    /*globals Node */
 
-    var isGlobalCache     = new Cache(1000, function(key) { return IS_GLOBAL.test(key);          });
-    var isGlobalPathCache = new Cache(1000, function(key) { return IS_GLOBAL_PATH.test(key);     });
-    var hasThisCache      = new Cache(1000, function(key) { return key.indexOf(HAS_THIS) !== -1; });
-    var isPathCache       = new Cache(1000, function(key) { return key.indexOf('.')      !== -1; });
-
-    var caches = {
-      isGlobalCache:     isGlobalCache,
-      isGlobalPathCache: isGlobalPathCache,
-      hasThisCache:      hasThisCache,
-      isPathCache:       isPathCache
-    };
-    __exports__.caches = caches;
-    function isGlobal(path) {
-      return isGlobalCache.get(path);
-    }
-
-    __exports__.isGlobal = isGlobal;function isGlobalPath(path) {
-      return isGlobalPathCache.get(path);
-    }
-
-    __exports__.isGlobalPath = isGlobalPath;function hasThis(path) {
-      return hasThisCache.get(path);
-    }
-
-    __exports__.hasThis = hasThis;function isPath(path) {
-      return isPathCache.get(path);
-    }
-
-    __exports__.isPath = isPath;
-  });
-enifed("ember-metal/platform",
-  ["ember-metal/platform/define_property","ember-metal/platform/define_properties","ember-metal/platform/create","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
-    "use strict";
-    var hasES5CompliantDefineProperty = __dependency1__.hasES5CompliantDefineProperty;
-    var defineProperty = __dependency1__.defineProperty;
-    var defineProperties = __dependency2__["default"];
-    var create = __dependency3__["default"];
+    var Ember = __dependency1__["default"];
 
     /**
     @module ember-metal
     */
 
-    var hasPropertyAccessors = hasES5CompliantDefineProperty;
-    var canDefineNonEnumerableProperties = hasES5CompliantDefineProperty;
-
     /**
       Platform specific methods and feature detectors needed by the framework.
 
@@ -16835,26 +15740,8 @@ enifed("ember-metal/platform",
       @namespace Ember
       @static
     */
-
-    __exports__.create = create;
-    __exports__.defineProperty = defineProperty;
-    __exports__.defineProperties = defineProperties;
-    __exports__.hasPropertyAccessors = hasPropertyAccessors;
-    __exports__.canDefineNonEnumerableProperties = canDefineNonEnumerableProperties;
-  });
-enifed("ember-metal/platform/create",
-  ["exports"],
-  function(__exports__) {
-        // Remove "use strict"; from transpiled module until
-    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
-    //
-    // REMOVE_USE_STRICT: true
-
-    /**
-    @class platform
-    @namespace Ember
-    @static
-    */
+    // TODO remove this
+    var platform = {};
 
     /**
       Identical to `Object.create()`. Implements if not available natively.
@@ -16862,190 +15749,76 @@ enifed("ember-metal/platform/create",
       @method create
       @for Ember
     */
-    var create;
-    // ES5 15.2.3.5
-    // http://es5.github.com/#x15.2.3.5
-    if (!(Object.create && !Object.create(null).hasOwnProperty)) {
-      /* jshint scripturl:true, proto:true */
-      // Contributed by Brandon Benvie, October, 2012
-      var createEmpty;
-      var supportsProto = !({'__proto__':null} instanceof Object);
-      // the following produces false positives
-      // in Opera Mini => not a reliable check
-      // Object.prototype.__proto__ === null
-      if (supportsProto || typeof document === 'undefined') {
-        createEmpty = function () {
-          return { "__proto__": null };
-        };
-      } else {
-        // In old IE __proto__ can't be used to manually set `null`, nor does
-        // any other method exist to make an object that inherits from nothing,
-        // aside from Object.prototype itself. Instead, create a new global
-        // object and *steal* its Object.prototype and strip it bare. This is
-        // used as the prototype to create nullary objects.
-        createEmpty = function () {
-          var iframe = document.createElement('iframe');
-          var parent = document.body || document.documentElement;
-          iframe.style.display = 'none';
-          parent.appendChild(iframe);
-          iframe.src = 'javascript:';
-          var empty = iframe.contentWindow.Object.prototype;
-          parent.removeChild(iframe);
-          iframe = null;
-          delete empty.constructor;
-          delete empty.hasOwnProperty;
-          delete empty.propertyIsEnumerable;
-          delete empty.isPrototypeOf;
-          delete empty.toLocaleString;
-          delete empty.toString;
-          delete empty.valueOf;
+    var create = Object.create;
 
-          function Empty() {}
-          Empty.prototype = empty;
-          // short-circuit future calls
-          createEmpty = function () {
-            return new Empty();
-          };
-          return new Empty();
-        };
+    // IE8 has Object.create but it couldn't treat property descriptors.
+    if (create) {
+      if (create({a: 1}, {a: {value: 2}}).a !== 2) {
+        create = null;
       }
-
-      create = Object.create = function create(prototype, properties) {
-
-        var object;
-        function Type() {}  // An empty constructor.
-
-        if (prototype === null) {
-          object = createEmpty();
-        } else {
-          if (typeof prototype !== "object" && typeof prototype !== "function") {
-            // In the native implementation `parent` can be `null`
-            // OR *any* `instanceof Object`  (Object|Function|Array|RegExp|etc)
-            // Use `typeof` tho, b/c in old IE, DOM elements are not `instanceof Object`
-            // like they are in modern browsers. Using `Object.create` on DOM elements
-            // is...err...probably inappropriate, but the native version allows for it.
-            throw new TypeError("Object prototype may only be an Object or null"); // same msg as Chrome
-          }
-
-          Type.prototype = prototype;
-
-          object = new Type();
-        }
-
-        if (properties !== undefined) {
-          Object.defineProperties(object, properties);
-        }
-
-        return object;
-      };
-    } else {
-      create = Object.create;
     }
 
-    __exports__["default"] = create;
-  });
-enifed("ember-metal/platform/define_properties",
-  ["ember-metal/platform/define_property","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var defineProperty = __dependency1__.defineProperty;
+    // STUB_OBJECT_CREATE allows us to override other libraries that stub
+    // Object.create different than we would prefer
+    if (!create || Ember.ENV.STUB_OBJECT_CREATE) {
+      var K = function() {};
 
-    var defineProperties = Object.defineProperties;
-
-    // ES5 15.2.3.7
-    // http://es5.github.com/#x15.2.3.7
-    if (!defineProperties) {
-      defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-          if (properties.hasOwnProperty(property) && property !== "__proto__") {
-            defineProperty(object, property, properties[property]);
+      create = function(obj, props) {
+        K.prototype = obj;
+        obj = new K();
+        if (props) {
+          K.prototype = obj;
+          for (var prop in props) {
+            K.prototype[prop] = props[prop].value;
           }
+          obj = new K();
         }
-        return object;
+        K.prototype = null;
+
+        return obj;
       };
 
-      Object.defineProperties = defineProperties;
+      create.isSimulated = true;
     }
 
-    __exports__["default"] = defineProperties;
-  });
-enifed("ember-metal/platform/define_property",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    /*globals Node */
+    var defineProperty = Object.defineProperty;
+    var canRedefineProperties, canDefinePropertyOnDOM;
 
-    /**
-    @class platform
-    @namespace Ember
-    @static
-    */
-
-    /**
-      Set to true if the platform supports native getters and setters.
-
-      @property hasPropertyAccessors
-      @final
-    */
-
-    /**
-      Identical to `Object.defineProperty()`. Implements as much functionality
-      as possible if not available natively.
-
-      @method defineProperty
-      @param {Object} obj The object to modify
-      @param {String} keyName property name to modify
-      @param {Object} desc descriptor hash
-      @return {void}
-    */
-    var defineProperty = (function checkCompliance(defineProperty) {
-      if (!defineProperty) return;
+    // Catch IE8 where Object.defineProperty exists but only works on DOM elements
+    if (defineProperty) {
       try {
-        var a = 5;
+        defineProperty({}, 'a',{get:function() {}});
+      } catch (e) {
+        defineProperty = null;
+      }
+    }
+
+    if (defineProperty) {
+      // Detects a bug in Android <3.2 where you cannot redefine a property using
+      // Object.defineProperty once accessors have already been set.
+      canRedefineProperties = (function() {
         var obj = {};
+
         defineProperty(obj, 'a', {
           configurable: true,
           enumerable: true,
-          get: function () {
-            return a;
-          },
-          set: function (v) {
-            a = v;
-          }
+          get: function() { },
+          set: function() { }
         });
-        if (obj.a !== 5) return;
-        obj.a = 10;
-        if (a !== 10) return;
 
-        // check non-enumerability
         defineProperty(obj, 'a', {
           configurable: true,
-          enumerable: false,
+          enumerable: true,
           writable: true,
           value: true
         });
-        for (var key in obj) {
-          if (key === 'a') return;
-        }
 
-        // Detects a bug in Android <3.2 where you cannot redefine a property using
-        // Object.defineProperty once accessors have already been set.
-        if (obj.a !== true) return;
+        return obj.a === true;
+      })();
 
-        // defineProperty is compliant
-        return defineProperty;
-      } catch (e) {
-        // IE8 defines Object.defineProperty but calling it on an Object throws
-        return;
-      }
-    })(Object.defineProperty);
-
-    var hasES5CompliantDefineProperty = !!defineProperty;
-
-    if (hasES5CompliantDefineProperty && typeof document !== 'undefined') {
       // This is for Safari 5.0, which supports Object.defineProperty, but not
       // on DOM nodes.
-      var canDefinePropertyOnDOM = (function() {
+      canDefinePropertyOnDOM = (function() {
         try {
           defineProperty(document.createElement('div'), 'definePropertyOnDOM', {});
           return true;
@@ -17054,7 +15827,9 @@ enifed("ember-metal/platform/define_property",
         return false;
       })();
 
-      if (!canDefinePropertyOnDOM) {
+      if (!canRedefineProperties) {
+        defineProperty = null;
+      } else if (!canDefinePropertyOnDOM) {
         defineProperty = function(obj, keyName, desc) {
           var isNode;
 
@@ -17074,28 +15849,69 @@ enifed("ember-metal/platform/define_property",
       }
     }
 
-    if (!hasES5CompliantDefineProperty) {
-      defineProperty = function defineProperty(obj, keyName, desc) {
+    /**
+    @class platform
+    @namespace Ember
+    */
+
+    /**
+      Identical to `Object.defineProperty()`. Implements as much functionality
+      as possible if not available natively.
+
+      @method defineProperty
+      @param {Object} obj The object to modify
+      @param {String} keyName property name to modify
+      @param {Object} desc descriptor hash
+      @return {void}
+    */
+    platform.defineProperty = defineProperty;
+
+    /**
+      Set to true if the platform supports native getters and setters.
+
+      @property hasPropertyAccessors
+      @final
+    */
+    platform.hasPropertyAccessors = true;
+
+    if (!platform.defineProperty) {
+      platform.hasPropertyAccessors = false;
+
+      platform.defineProperty = function(obj, keyName, desc) {
         if (!desc.get) { obj[keyName] = desc.value; }
       };
+
+      platform.defineProperty.isSimulated = true;
     }
 
-    __exports__.hasES5CompliantDefineProperty = hasES5CompliantDefineProperty;
-    __exports__.defineProperty = defineProperty;
+    if (Ember.ENV.MANDATORY_SETTER && !platform.hasPropertyAccessors) {
+      Ember.ENV.MANDATORY_SETTER = false;
+    }
+
+    __exports__.create = create;
+    __exports__.platform = platform;
   });
-enifed("ember-metal/properties",
-  ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/property_events","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+define("ember-metal/properties",
+  ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/property_events","ember-metal/property_get","ember-metal/property_set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
     /**
     @module ember-metal
     */
 
     var Ember = __dependency1__["default"];
-    var metaFor = __dependency2__.meta;
-    var objectDefineProperty = __dependency3__.defineProperty;
-    var hasPropertyAccessors = __dependency3__.hasPropertyAccessors;
+    var META_KEY = __dependency2__.META_KEY;
+    var meta = __dependency2__.meta;
+    var platform = __dependency3__.platform;
     var overrideChains = __dependency4__.overrideChains;
+    var get = __dependency5__.get;
+    var set = __dependency6__.set;
+
+    var metaFor = meta,
+        objectDefineProperty = platform.defineProperty;
+
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
+
     // ..........................................................
     // DESCRIPTOR
     //
@@ -17117,19 +15933,17 @@ enifed("ember-metal/properties",
     // DEFINING PROPERTIES API
     //
 
-    function MANDATORY_SETTER_FUNCTION(name) {
-      return function SETTER_FUNCTION(value) {
-              };
-    }
+    var MANDATORY_SETTER_FUNCTION = Ember.MANDATORY_SETTER_FUNCTION = function(value) {
+          };
 
-    __exports__.MANDATORY_SETTER_FUNCTION = MANDATORY_SETTER_FUNCTION;function DEFAULT_GETTER_FUNCTION(name) {
-      return function GETTER_FUNCTION() {
-        var meta = this['__ember_meta__'];
+    var DEFAULT_GETTER_FUNCTION = Ember.DEFAULT_GETTER_FUNCTION = function DEFAULT_GETTER_FUNCTION(name) {
+      return function() {
+        var meta = this[META_KEY];
         return meta && meta.values[name];
       };
-    }
+    };
 
-    __exports__.DEFAULT_GETTER_FUNCTION = DEFAULT_GETTER_FUNCTION;/**
+    /**
       NOTE: This is a low-level method used by other parts of the API. You almost
       never want to call this method directly. Instead you should use
       `Ember.mixin()` to define new properties.
@@ -17180,9 +15994,7 @@ enifed("ember-metal/properties",
       if (!meta) meta = metaFor(obj);
       descs = meta.descs;
       existingDesc = meta.descs[keyName];
-      var watchEntry = meta.watching[keyName];
-
-      watching = watchEntry !== undefined && watchEntry > 0;
+      watching = meta.watching[keyName] > 0;
 
       if (existingDesc instanceof Descriptor) {
         existingDesc.teardown(obj, keyName);
@@ -17192,18 +16004,33 @@ enifed("ember-metal/properties",
         value = desc;
 
         descs[keyName] = desc;
-        
+        if (MANDATORY_SETTER && watching) {
+          objectDefineProperty(obj, keyName, {
+            configurable: true,
+            enumerable: true,
+            writable: true,
+            value: undefined // make enumerable
+          });
+        } else {
           obj[keyName] = undefined; // make enumerable
-        
+        }
         if (desc.setup) { desc.setup(obj, keyName); }
       } else {
         descs[keyName] = undefined; // shadow descriptor in proto
         if (desc == null) {
           value = data;
 
-          
+          if (MANDATORY_SETTER && watching) {
+            meta.values[keyName] = data;
+            objectDefineProperty(obj, keyName, {
+              configurable: true,
+              enumerable: true,
+              set: MANDATORY_SETTER_FUNCTION,
+              get: DEFAULT_GETTER_FUNCTION(keyName)
+            });
+          } else {
             obj[keyName] = data;
-          
+          }
         } else {
           value = desc;
 
@@ -17222,12 +16049,40 @@ enifed("ember-metal/properties",
 
       return this;
     }
-    __exports__.defineProperty = defineProperty;
+
+    __exports__.defineProperty = defineProperty;/**
+      Used internally to allow changing properties in a backwards compatible way, and print a helpful
+      deprecation warning.
+
+      @method deprecateProperty
+      @param {Object} object The object to add the deprecated property to.
+      @param {String} deprecatedKey The property to add (and print deprecation warnings upon accessing).
+      @param {String} newKey The property that will be aliased.
+      @private
+      @since 1.7.0
+    */
+
+    function deprecateProperty(object, deprecatedKey, newKey) {
+      function deprecate() {
+              }
+
+      if (platform.hasPropertyAccessors) {
+        defineProperty(object, deprecatedKey, {
+            configurable: true,
+            enumerable: false,
+            set: function(value) { deprecate(); set(this, newKey, value); },
+            get: function() { deprecate(); return get(this, newKey); }
+        });
+      }
+    }
+
+    __exports__.deprecateProperty = deprecateProperty;
   });
-enifed("ember-metal/property_events",
+define("ember-metal/property_events",
   ["ember-metal/utils","ember-metal/events","ember-metal/observer_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
+    var META_KEY = __dependency1__.META_KEY;
     var guidFor = __dependency1__.guidFor;
     var tryFinally = __dependency1__.tryFinally;
     var sendEvent = __dependency2__.sendEvent;
@@ -17259,10 +16114,10 @@ enifed("ember-metal/property_events",
       @return {void}
     */
     function propertyWillChange(obj, keyName) {
-      var m = obj['__ember_meta__'];
-      var watching = (m && m.watching[keyName] > 0) || keyName === 'length';
-      var proto = m && m.proto;
-      var desc = m && m.descs[keyName];
+      var m = obj[META_KEY],
+          watching = (m && m.watching[keyName] > 0) || keyName === 'length',
+          proto = m && m.proto,
+          desc = m && m.descs[keyName];
 
       if (!watching) { return; }
       if (proto === obj) { return; }
@@ -17288,10 +16143,10 @@ enifed("ember-metal/property_events",
       @return {void}
     */
     function propertyDidChange(obj, keyName) {
-      var m = obj['__ember_meta__'];
-      var watching = (m && m.watching[keyName] > 0) || keyName === 'length';
-      var proto = m && m.proto;
-      var desc = m && m.descs[keyName];
+      var m = obj[META_KEY],
+          watching = (m && m.watching[keyName] > 0) || keyName === 'length',
+          proto = m && m.proto,
+          desc = m && m.descs[keyName];
 
       if (proto === obj) { return; }
 
@@ -17299,63 +16154,44 @@ enifed("ember-metal/property_events",
       if (desc && desc.didChange) { desc.didChange(obj, keyName); }
       if (!watching && keyName !== 'length') { return; }
 
-      if (m && m.deps && m.deps[keyName]) {
-        dependentKeysDidChange(obj, keyName, m);
-      }
-
+      dependentKeysDidChange(obj, keyName, m);
       chainsDidChange(obj, keyName, m, false);
       notifyObservers(obj, keyName);
     }
 
     var WILL_SEEN, DID_SEEN;
+
     // called whenever a property is about to change to clear the cache of any dependent keys (and notify those properties of changes, etc...)
     function dependentKeysWillChange(obj, depKey, meta) {
       if (obj.isDestroying) { return; }
 
-      var deps;
-      if (meta && meta.deps && (deps = meta.deps[depKey])) {
-        var seen = WILL_SEEN;
-        var top = !seen;
-        if (top) { seen = WILL_SEEN = {}; }
-        iterDeps(propertyWillChange, obj, deps, depKey, seen, meta);
-        if (top) { WILL_SEEN = null; }
-      }
+      var seen = WILL_SEEN, top = !seen;
+      if (top) { seen = WILL_SEEN = {}; }
+      iterDeps(propertyWillChange, obj, depKey, seen, meta);
+      if (top) { WILL_SEEN = null; }
     }
 
     // called whenever a property has just changed to update dependent keys
     function dependentKeysDidChange(obj, depKey, meta) {
       if (obj.isDestroying) { return; }
 
-      var deps;
-      if (meta && meta.deps && (deps = meta.deps[depKey])) {
-        var seen = DID_SEEN;
-        var top = !seen;
-        if (top) { seen = DID_SEEN = {}; }
-        iterDeps(propertyDidChange, obj, deps, depKey, seen, meta);
-        if (top) { DID_SEEN = null; }
-      }
+      var seen = DID_SEEN, top = !seen;
+      if (top) { seen = DID_SEEN = {}; }
+      iterDeps(propertyDidChange, obj, depKey, seen, meta);
+      if (top) { DID_SEEN = null; }
     }
 
-    function keysOf(obj) {
-      var keys = [];
-      for (var key in obj) keys.push(key);
-      return keys;
-    }
-
-    function iterDeps(method, obj, deps, depKey, seen, meta) {
-      var keys, key, i, desc;
+    function iterDeps(method, obj, depKey, seen, meta) {
       var guid = guidFor(obj);
-      var current = seen[guid];
-      if (!current) current = seen[guid] = {};
-      if (current[depKey]) return;
-      current[depKey] = true;
+      if (!seen[guid]) seen[guid] = {};
+      if (seen[guid][depKey]) return;
+      seen[guid][depKey] = true;
 
+      var deps = meta.deps;
+      deps = deps && deps[depKey];
       if (deps) {
-        keys = keysOf(deps);
-        var descs = meta.descs;
-        for (i=0; i<keys.length; i++) {
-          key = keys[i];
-          desc = descs[key];
+        for(var key in deps) {
+          var desc = meta.descs[key];
           if (desc && desc._suspended === obj) continue;
           method(obj, key);
         }
@@ -17368,9 +16204,9 @@ enifed("ember-metal/property_events",
         return;
       }
 
-      var nodes = m.chainWatchers[keyName];
-      var events = [];
-      var i, l;
+      var nodes = m.chainWatchers[keyName],
+          events = [],
+          i, l;
 
       for(i = 0, l = nodes.length; i < l; i++) {
         nodes[i].willChange(events);
@@ -17387,9 +16223,9 @@ enifed("ember-metal/property_events",
         return;
       }
 
-      var nodes = m.chainWatchers[keyName];
-      var events = suppressEvents ? null : [];
-      var i, l;
+      var nodes = m.chainWatchers[keyName],
+          events = suppressEvents ? null : [],
+          i, l;
 
       for(i = 0, l = nodes.length; i < l; i++) {
         nodes[i].didChange(events);
@@ -17452,8 +16288,7 @@ enifed("ember-metal/property_events",
     function notifyBeforeObservers(obj, keyName) {
       if (obj.isDestroying) { return; }
 
-      var eventName = keyName + ':before';
-      var listeners, diff;
+      var eventName = keyName + ':before', listeners, diff;
       if (deferred) {
         listeners = beforeObserverSet.add(obj, keyName, eventName);
         diff = listenersDiff(obj, eventName, listeners);
@@ -17466,8 +16301,7 @@ enifed("ember-metal/property_events",
     function notifyObservers(obj, keyName) {
       if (obj.isDestroying) { return; }
 
-      var eventName = keyName + ':change';
-      var listeners;
+      var eventName = keyName + ':change', listeners;
       if (deferred) {
         listeners = observerSet.add(obj, keyName, eventName);
         listenersUnion(obj, eventName, listeners);
@@ -17483,21 +16317,24 @@ enifed("ember-metal/property_events",
     __exports__.endPropertyChanges = endPropertyChanges;
     __exports__.changeProperties = changeProperties;
   });
-enifed("ember-metal/property_get",
-  ["ember-metal/core","ember-metal/error","ember-metal/path_cache","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+define("ember-metal/property_get",
+  ["ember-metal/core","ember-metal/utils","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     /**
     @module ember-metal
     */
 
     var Ember = __dependency1__["default"];
-    var EmberError = __dependency2__["default"];
-    var isGlobalPath = __dependency3__.isGlobalPath;
-    var isPath = __dependency3__.isPath;
-    var pathHasThis = __dependency3__.hasThis;
-    var hasPropertyAccessors = __dependency4__.hasPropertyAccessors;
+    var META_KEY = __dependency2__.META_KEY;
+    var EmberError = __dependency3__["default"];
 
+    var get;
+
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
+
+    var IS_GLOBAL_PATH = /^([A-Z$]|([0-9][A-Z$])).*[\.]/;
+    var HAS_THIS  = 'this.';
     var FIRST_KEY = /^([^\.]+)/;
 
     // ..........................................................
@@ -17537,31 +16374,28 @@ enifed("ember-metal/property_get",
         return obj;
       }
 
-      if (!keyName && 'string' === typeof obj) {
+      if (!keyName && 'string'===typeof obj) {
         keyName = obj;
         obj = null;
       }
 
             
-      if (obj === null) {
-        var value = _getPath(obj, keyName);
-                return value;
-      }
+      if (obj === null) { return _getPath(obj, keyName);  }
 
-      var meta = obj['__ember_meta__'];
-      var desc = meta && meta.descs[keyName];
-      var ret;
+      var meta = obj[META_KEY], desc = meta && meta.descs[keyName], ret;
 
-      if (desc === undefined && isPath(keyName)) {
+      if (desc === undefined && keyName.indexOf('.') !== -1) {
         return _getPath(obj, keyName);
       }
 
       if (desc) {
         return desc.get(obj, keyName);
       } else {
-        
+        if (MANDATORY_SETTER && meta && meta.watching[keyName] > 0) {
+          ret = meta.values[keyName];
+        } else {
           ret = obj[keyName];
-        
+        }
 
         if (ret === undefined &&
             'object' === typeof obj && !(keyName in obj) && 'function' === typeof obj.unknownProperty) {
@@ -17593,14 +16427,13 @@ enifed("ember-metal/property_get",
       @return {Array} a temporary array with the normalized target/path pair.
     */
     function normalizeTuple(target, path) {
-      var hasThis  = pathHasThis(path);
-      var isGlobal = !hasThis && isGlobalPath(path);
-      var key;
+      var hasThis  = path.indexOf(HAS_THIS) === 0,
+          isGlobal = !hasThis && IS_GLOBAL_PATH.test(path),
+          key;
 
       if (!target || isGlobal) target = Ember.lookup;
       if (hasThis) path = path.slice(5);
 
-      
       if (target === Ember.lookup) {
         key = path.match(FIRST_KEY)[0];
         target = get(target, key);
@@ -17619,12 +16452,10 @@ enifed("ember-metal/property_get",
       // If there is no root and path is a key name, return that
       // property from the global object.
       // E.g. get('Ember') -> Ember
-      if (root === null && !isPath(path)) {
-        return get(Ember.lookup, path);
-      }
+      if (root === null && path.indexOf('.') === -1) { return get(Ember.lookup, path); }
 
       // detect complicated paths and normalize them
-      hasThis = pathHasThis(path);
+      hasThis = path.indexOf(HAS_THIS) === 0;
 
       if (!root || hasThis) {
         tuple = normalizeTuple(root, path);
@@ -17654,19 +16485,19 @@ enifed("ember-metal/property_get",
     __exports__.normalizeTuple = normalizeTuple;
     __exports__._getPath = _getPath;
   });
-enifed("ember-metal/property_set",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_events","ember-metal/properties","ember-metal/error","ember-metal/path_cache","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+define("ember-metal/property_set",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/property_events","ember-metal/properties","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var getPath = __dependency2__._getPath;
-    var propertyWillChange = __dependency3__.propertyWillChange;
-    var propertyDidChange = __dependency3__.propertyDidChange;
-    var defineProperty = __dependency4__.defineProperty;
-    var EmberError = __dependency5__["default"];
-    var isPath = __dependency6__.isPath;
-    var hasPropertyAccessors = __dependency7__.hasPropertyAccessors;
+    var META_KEY = __dependency3__.META_KEY;
+    var propertyWillChange = __dependency4__.propertyWillChange;
+    var propertyDidChange = __dependency4__.propertyDidChange;
+    var defineProperty = __dependency5__.defineProperty;
+    var EmberError = __dependency6__["default"];
 
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
     var IS_GLOBAL = /^([A-Z$]|([0-9][A-Z$]))/;
 
     /**
@@ -17694,11 +16525,10 @@ enifed("ember-metal/property_set",
         return setPath(obj, keyName, value, tolerant);
       }
 
-      var meta = obj['__ember_meta__'];
-      var desc = meta && meta.descs[keyName];
-      var isUnknown, currentValue;
+      var meta = obj[META_KEY], desc = meta && meta.descs[keyName],
+          isUnknown, currentValue;
 
-      if (desc === undefined && isPath(keyName)) {
+      if (desc === undefined && keyName.indexOf('.') !== -1) {
         return setPath(obj, keyName, value, tolerant);
       }
 
@@ -17719,15 +16549,23 @@ enifed("ember-metal/property_set",
         if (isUnknown && 'function' === typeof obj.setUnknownProperty) {
           obj.setUnknownProperty(keyName, value);
         } else if (meta && meta.watching[keyName] > 0) {
-          
+          if (MANDATORY_SETTER) {
+            currentValue = meta.values[keyName];
+          } else {
             currentValue = obj[keyName];
-          
+          }
           // only trigger a change if the value has changed
           if (value !== currentValue) {
             propertyWillChange(obj, keyName);
-            
+            if (MANDATORY_SETTER) {
+              if ((currentValue === undefined && !(keyName in obj)) || !obj.propertyIsEnumerable(keyName)) {
+                defineProperty(obj, keyName, null, value); // setup mandatory setter
+              } else {
+                meta.values[keyName] = value;
+              }
+            } else {
               obj[keyName] = value;
-            
+            }
             propertyDidChange(obj, keyName);
           }
         } else {
@@ -17791,17 +16629,15 @@ enifed("ember-metal/property_set",
 
     __exports__.trySet = trySet;__exports__.set = set;
   });
-enifed("ember-metal/run_loop",
-  ["ember-metal/core","ember-metal/utils","ember-metal/array","ember-metal/property_events","backburner","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+define("ember-metal/run_loop",
+  ["ember-metal/core","ember-metal/utils","ember-metal/array","ember-metal/property_events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var apply = __dependency2__.apply;
-    var GUID_KEY = __dependency2__.GUID_KEY;
     var indexOf = __dependency3__.indexOf;
     var beginPropertyChanges = __dependency4__.beginPropertyChanges;
     var endPropertyChanges = __dependency4__.endPropertyChanges;
-    var Backburner = __dependency5__["default"];
 
     function onBegin(current) {
       run.currentRunLoop = current;
@@ -17812,8 +16648,8 @@ enifed("ember-metal/run_loop",
     }
 
     // ES6TODO: should Backburner become es6?
+    var Backburner = requireModule('backburner').Backburner;
     var backburner = new Backburner(['sync', 'actions', 'destroy'], {
-      GUID_KEY: GUID_KEY,
       sync: {
         before: beginPropertyChanges,
         after: endPropertyChanges
@@ -17860,7 +16696,7 @@ enifed("ember-metal/run_loop",
     */
     __exports__["default"] = run;
     function run() {
-      return backburner.run.apply(backburner, arguments);
+      return apply(backburner, backburner.run, arguments);
     }
 
     /**
@@ -17902,12 +16738,12 @@ enifed("ember-metal/run_loop",
     */
     run.join = function(target, method /* args */) {
       if (!run.currentRunLoop) {
-        return Ember.run.apply(Ember, arguments);
+        return apply(Ember, run, arguments);
       }
 
       var args = slice.call(arguments);
       args.unshift('actions');
-      run.schedule.apply(run, args);
+      apply(run, run.schedule, args);
     };
 
     /**
@@ -17954,7 +16790,7 @@ enifed("ember-metal/run_loop",
     run.bind = function(target, method /* args*/) {
       var args = slice.call(arguments);
       return function() {
-        return run.join.apply(run, args.concat(slice.call(arguments)));
+        return apply(run, run.join, args.concat(slice.call(arguments)));
       };
     };
 
@@ -18048,7 +16884,7 @@ enifed("ember-metal/run_loop",
     */
     run.schedule = function(queue, target, method) {
       checkAutoRun();
-      backburner.schedule.apply(backburner, arguments);
+      apply(backburner, backburner.schedule, arguments);
     };
 
     // Used by global test teardown
@@ -18085,7 +16921,7 @@ enifed("ember-metal/run_loop",
 
     /**
       Invokes the passed target/method and optional arguments after a specified
-      period of time. The last parameter of this method must always be a number
+      period if time. The last parameter of this method must always be a number
       of milliseconds.
 
       You should use this method whenever you need to run some action after a
@@ -18106,10 +16942,11 @@ enifed("ember-metal/run_loop",
         target at the time the method is invoked.
       @param {Object} [args*] Optional arguments to pass to the timeout.
       @param {Number} wait Number of milliseconds to wait.
-      @return {Object} Timer information for use in cancelling, see `run.cancel`.
+      @return {String} a string you can use to cancel the timer in
+        `run.cancel` later.
     */
-    run.later = function(/*target, method*/) {
-      return backburner.later.apply(backburner, arguments);
+    run.later = function(target, method) {
+      return apply(backburner, backburner.later, arguments);
     };
 
     /**
@@ -18175,9 +17012,9 @@ enifed("ember-metal/run_loop",
       @param {Object} [args*] Optional arguments to pass to the timeout.
       @return {Object} Timer information for use in cancelling, see `run.cancel`.
     */
-    run.scheduleOnce = function(/*queue, target, method*/) {
+    run.scheduleOnce = function(queue, target, method) {
       checkAutoRun();
-      return backburner.scheduleOnce.apply(backburner, arguments);
+      return apply(backburner, backburner.scheduleOnce, arguments);
     };
 
     /**
@@ -18356,7 +17193,7 @@ enifed("ember-metal/run_loop",
       @return {Array} Timer information for use in cancelling, see `run.cancel`.
     */
     run.debounce = function() {
-      return backburner.debounce.apply(backburner, arguments);
+      return apply(backburner, backburner.debounce, arguments);
     };
 
     /**
@@ -18395,7 +17232,7 @@ enifed("ember-metal/run_loop",
       @return {Array} Timer information for use in cancelling, see `run.cancel`.
     */
     run.throttle = function() {
-      return backburner.throttle.apply(backburner, arguments);
+      return apply(backburner, backburner.throttle, arguments);
     };
 
     // Make sure it's not an autorun during testing
@@ -18420,13 +17257,12 @@ enifed("ember-metal/run_loop",
       }
     };
   });
-enifed("ember-metal/set_properties",
-  ["ember-metal/property_events","ember-metal/property_set","ember-metal/keys","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+define("ember-metal/set_properties",
+  ["ember-metal/property_events","ember-metal/property_set","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var changeProperties = __dependency1__.changeProperties;
     var set = __dependency2__.set;
-    var keys = __dependency3__["default"];
 
     /**
       Set a list of properties on an object. These properties are set inside
@@ -18444,26 +17280,20 @@ enifed("ember-metal/set_properties",
       ```
 
       @method setProperties
-      @param obj
-      @param {Object} properties
-      @return obj
+      @param self
+      @param {Object} hash
+      @return self
     */
-    __exports__["default"] = function setProperties(obj, properties) {
-      if (!properties || typeof properties !== "object") { return obj; }
+    __exports__["default"] = function setProperties(self, hash) {
       changeProperties(function() {
-        var props = keys(properties);
-        var propertyName;
-
-        for (var i = 0, l = props.length; i < l; i++) {
-          propertyName = props[i];
-
-          set(obj, propertyName, properties[propertyName]);
+        for(var prop in hash) {
+          if (hash.hasOwnProperty(prop)) { set(self, prop, hash[prop]); }
         }
       });
-      return obj;
+      return self;
     }
   });
-enifed("ember-metal/utils",
+define("ember-metal/utils",
   ["ember-metal/core","ember-metal/platform","ember-metal/array","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
         // Remove "use strict"; from transpiled module until
@@ -18472,9 +17302,7 @@ enifed("ember-metal/utils",
     // REMOVE_USE_STRICT: true
 
     var Ember = __dependency1__["default"];
-    var o_defineProperty = __dependency2__.defineProperty;
-    var canDefineNonEnumerableProperties = __dependency2__.canDefineNonEnumerableProperties;
-    var hasPropertyAccessors = __dependency2__.hasPropertyAccessors;
+    var platform = __dependency2__.platform;
     var create = __dependency2__.create;
 
     var forEach = __dependency3__.forEach;
@@ -18515,58 +17343,12 @@ enifed("ember-metal/utils",
     */
     var GUID_PREFIX = 'ember';
 
+    var o_defineProperty = platform.defineProperty;
     var o_create = create;
     // Used for guid generation...
     var numberCache  = [];
     var stringCache  = {};
-
-    /**
-      Strongly hint runtimes to intern the provided string.
-
-      When do I need to use this function?
-
-      For the most part, never. Pre-mature optimization is bad, and often the
-      runtime does exactly what you need it to, and more often the trade-off isn't
-      worth it.
-
-      Why?
-
-      Runtimes store strings in at least 2 different representations:
-      Ropes and Symbols (interned strings). The Rope provides a memory efficient
-      data-structure for strings created from concatenation or some other string
-      manipulation like splitting.
-
-      Unfortunately checking equality of different ropes can be quite costly as
-      runtimes must resort to clever string comparison algorithims. These
-      algorithims typically cost in proportion to the length of the string.
-      Luckily, this is where the Symbols (interned strings) shine. As Symbols are
-      unique by their string content, equality checks can be done by pointer
-      comparision.
-
-      How do I know if my string is a rope or symbol?
-
-      Typically (warning general sweeping statement, but truthy in runtimes at
-      present) static strings created as part of the JS source are interned.
-      Strings often used for comparisions can be interned at runtime if some
-      criteria are met.  One of these criteria can be the size of the entire rope.
-      For example, in chrome 38 a rope longer then 12 characters will not
-      intern, nor will segments of that rope.
-
-      Some numbers: http://jsperf.com/eval-vs-keys/8
-
-      Known Trick™
-
-      @private
-      @return {String} interned version of the provided string
-    */
-    function intern(str) {
-      var obj = {};
-      obj[str] = 1;
-      for (var key in obj) {
-        if (key === str) return key;
-      }
-      return str;
-    }
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
 
     /**
       A unique key used to assign guids and other private metadata to objects.
@@ -18582,7 +17364,7 @@ enifed("ember-metal/utils",
       @type String
       @final
     */
-    var GUID_KEY = intern('__ember' + (+ new Date()));
+    var GUID_KEY = '__ember' + (+ new Date());
 
     var GUID_DESC = {
       writable:    false,
@@ -18664,7 +17446,7 @@ enifed("ember-metal/utils",
           if (obj[GUID_KEY]) return obj[GUID_KEY];
           if (obj === Object) return '(Object)';
           if (obj === Array)  return '(Array)';
-          ret = GUID_PREFIX + uuid();
+          ret = 'ember' + uuid();
 
           if (obj[GUID_KEY] === null) {
             obj[GUID_KEY] = ret;
@@ -18687,6 +17469,19 @@ enifed("ember-metal/utils",
       value: null
     };
 
+    /**
+      The key used to store meta information on object for property observing.
+
+      @property META_KEY
+      @for Ember
+      @private
+      @final
+      @type String
+    */
+    var META_KEY = '__ember_meta__';
+
+    var isDefinePropertySimulated = platform.defineProperty.isSimulated;
+
     function Meta(obj) {
       this.descs = {};
       this.watching = {};
@@ -18711,7 +17506,7 @@ enifed("ember-metal/utils",
       proto: null
     };
 
-    if (!canDefineNonEnumerableProperties) {
+    if (isDefinePropertySimulated) {
       // on platforms that don't support enumerable false
       // make meta fail jQuery.isPlainObject() to hide from
       // jQuery.extend() by having a property that fails
@@ -18726,7 +17521,8 @@ enifed("ember-metal/utils",
     // Placeholder for non-writable metas.
     var EMPTY_META = new Meta(null);
 
-    
+    if (MANDATORY_SETTER) { EMPTY_META.values = {}; }
+
     /**
       Retrieves the meta hash for an object. If `writable` is true ensures the
       hash is writable for this object as well.
@@ -18747,22 +17543,23 @@ enifed("ember-metal/utils",
     */
     function meta(obj, writable) {
 
-      var ret = obj['__ember_meta__'];
+      var ret = obj[META_KEY];
       if (writable===false) return ret || EMPTY_META;
 
       if (!ret) {
-        if (canDefineNonEnumerableProperties) o_defineProperty(obj, '__ember_meta__', META_DESC);
+        if (!isDefinePropertySimulated) o_defineProperty(obj, META_KEY, META_DESC);
 
         ret = new Meta(obj);
 
-        
-        obj['__ember_meta__'] = ret;
+        if (MANDATORY_SETTER) { ret.values = {}; }
+
+        obj[META_KEY] = ret;
 
         // make sure we don't accidentally try to create constructor like desc
         ret.descs.constructor = null;
 
       } else if (ret.source !== obj) {
-        if (canDefineNonEnumerableProperties) o_defineProperty(obj, '__ember_meta__', META_DESC);
+        if (!isDefinePropertySimulated) o_defineProperty(obj, META_KEY, META_DESC);
 
         ret = o_create(ret);
         ret.descs     = o_create(ret.descs);
@@ -18771,8 +17568,9 @@ enifed("ember-metal/utils",
         ret.cacheMeta = {};
         ret.source    = obj;
 
-        
-        obj['__ember_meta__'] = ret;
+        if (MANDATORY_SETTER) { ret.values = o_create(ret.values); }
+
+        obj[META_KEY] = ret;
       }
       return ret;
     }
@@ -18822,8 +17620,7 @@ enifed("ember-metal/utils",
         shared with its constructor
     */
     function metaPath(obj, path, writable) {
-            var _meta = meta(obj, writable);
-      var keyName, value;
+            var _meta = meta(obj, writable), keyName, value;
 
       for (var i=0, l=path.length; i<l; i++) {
         keyName = path[i];
@@ -18858,14 +17655,9 @@ enifed("ember-metal/utils",
     */
     function wrap(func, superFunc) {
       function superWrapper() {
-        var ret;
-        var sup  = this && this.__nextSuper;
-        var args = new Array(arguments.length);
-        for (var i = 0, l = args.length; i < l; i++) {
-          args[i] = arguments[i];
-        }
+        var ret, sup = this && this.__nextSuper;
         if(this) { this.__nextSuper = superFunc; }
-        ret = apply(this, func, args);
+        ret = apply(this, func, arguments);
         if(this) { this.__nextSuper = sup; }
         return ret;
       }
@@ -19268,19 +18060,13 @@ enifed("ember-metal/utils",
         return obj + '';
       }
 
-      var v;
-      var ret = [];
+      var v, ret = [];
       for(var key in obj) {
         if (obj.hasOwnProperty(key)) {
           v = obj[key];
           if (v === 'toString') { continue; } // ignore useless items
           if (typeOf(v) === 'function') { v = "function() { ... }"; }
-
-          if (v && typeof v.toString !== 'function') {
-            ret.push(key + ": " + toString.call(v));
-          } else {
-            ret.push(key + ": " + v);
-          }
+          ret.push(key + ": " + v);
         }
       }
       return "{" + ret.join(", ") + "}";
@@ -19316,8 +18102,10 @@ enifed("ember-metal/utils",
     }
 
     __exports__.applyStr = applyStr;__exports__.GUID_KEY = GUID_KEY;
+    __exports__.GUID_PREFIX = GUID_PREFIX;
     __exports__.META_DESC = META_DESC;
     __exports__.EMPTY_META = EMPTY_META;
+    __exports__.META_KEY = META_KEY;
     __exports__.meta = meta;
     __exports__.typeOf = typeOf;
     __exports__.tryCatchFinally = tryCatchFinally;
@@ -19325,20 +18113,18 @@ enifed("ember-metal/utils",
     __exports__.canInvoke = canInvoke;
     __exports__.tryFinally = tryFinally;
   });
-enifed("ember-metal/watch_key",
-  ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/properties","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+define("ember-metal/watch_key",
+  ["ember-metal/core","ember-metal/utils","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var meta = __dependency2__.meta;
     var typeOf = __dependency2__.typeOf;
-    var o_defineProperty = __dependency3__.defineProperty;
-    var hasPropertyAccessors = __dependency3__.hasPropertyAccessors;
-    var MANDATORY_SETTER_FUNCTION = __dependency4__.MANDATORY_SETTER_FUNCTION;
-    var DEFAULT_GETTER_FUNCTION = __dependency4__.DEFAULT_GETTER_FUNCTION;
+    var platform = __dependency3__.platform;
 
     var metaFor = meta; // utils.js
-
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
+    var o_defineProperty = platform.defineProperty;
 
     function watchKey(obj, keyName, meta) {
       // can't watch length on Array - it is special...
@@ -19357,14 +18143,21 @@ enifed("ember-metal/watch_key",
           obj.willWatchProperty(keyName);
         }
 
-              } else {
+        if (MANDATORY_SETTER && keyName in obj) {
+          m.values[keyName] = obj[keyName];
+          o_defineProperty(obj, keyName, {
+            configurable: true,
+            enumerable: obj.propertyIsEnumerable(keyName),
+            set: Ember.MANDATORY_SETTER_FUNCTION,
+            get: Ember.DEFAULT_GETTER_FUNCTION(keyName)
+          });
+        }
+      } else {
         watching[keyName] = (watching[keyName] || 0) + 1;
       }
     }
 
-    __exports__.watchKey = watchKey;
-    
-    function unwatchKey(obj, keyName, meta) {
+    __exports__.watchKey = watchKey;function unwatchKey(obj, keyName, meta) {
       var m = meta || metaFor(obj), watching = m.watching;
 
       if (watching[keyName] === 1) {
@@ -19377,14 +18170,31 @@ enifed("ember-metal/watch_key",
           obj.didUnwatchProperty(keyName);
         }
 
-              } else if (watching[keyName] > 1) {
+        if (MANDATORY_SETTER && keyName in obj) {
+          o_defineProperty(obj, keyName, {
+            configurable: true,
+            enumerable: obj.propertyIsEnumerable(keyName),
+            set: function(val) {
+              // redefine to set as enumerable
+              o_defineProperty(obj, keyName, {
+                configurable: true,
+                writable: true,
+                enumerable: true,
+                value: val
+              });
+              delete m.values[keyName];
+            },
+            get: Ember.DEFAULT_GETTER_FUNCTION(keyName)
+          });
+        }
+      } else if (watching[keyName] > 1) {
         watching[keyName]--;
       }
     }
 
     __exports__.unwatchKey = unwatchKey;
   });
-enifed("ember-metal/watch_path",
+define("ember-metal/watch_path",
   ["ember-metal/utils","ember-metal/chains","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -19398,8 +18208,7 @@ enifed("ember-metal/watch_path",
     // chains inherited from the proto they will be cloned and reconfigured for
     // the current object.
     function chainsFor(obj, meta) {
-      var m = meta || metaFor(obj);
-      var ret = m.chains;
+      var m = meta || metaFor(obj), ret = m.chains;
       if (!ret) {
         ret = m.chains = new ChainNode(null, null, obj);
       } else if (ret.value() !== obj) {
@@ -19412,8 +18221,7 @@ enifed("ember-metal/watch_path",
       // can't watch length on Array - it is special...
       if (keyPath === 'length' && typeOf(obj) === 'array') { return; }
 
-      var m = meta || metaFor(obj);
-      var watching = m.watching;
+      var m = meta || metaFor(obj), watching = m.watching;
 
       if (!watching[keyPath]) { // activate watching first time
         watching[keyPath] = 1;
@@ -19424,8 +18232,7 @@ enifed("ember-metal/watch_path",
     }
 
     __exports__.watchPath = watchPath;function unwatchPath(obj, keyPath, meta) {
-      var m = meta || metaFor(obj);
-      var watching = m.watching;
+      var m = meta || metaFor(obj), watching = m.watching;
 
       if (watching[keyPath] === 1) {
         watching[keyPath] = 0;
@@ -19437,15 +18244,16 @@ enifed("ember-metal/watch_path",
 
     __exports__.unwatchPath = unwatchPath;
   });
-enifed("ember-metal/watching",
-  ["ember-metal/utils","ember-metal/chains","ember-metal/watch_key","ember-metal/watch_path","ember-metal/path_cache","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+define("ember-metal/watching",
+  ["ember-metal/utils","ember-metal/chains","ember-metal/watch_key","ember-metal/watch_path","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
     @module ember-metal
     */
 
     var meta = __dependency1__.meta;
+    var META_KEY = __dependency1__.META_KEY;
     var GUID_KEY = __dependency1__.GUID_KEY;
     var typeOf = __dependency1__.typeOf;
     var generateGuid = __dependency1__.generateGuid;
@@ -19457,7 +18265,11 @@ enifed("ember-metal/watching",
     var unwatchPath = __dependency4__.unwatchPath;
 
     var metaFor = meta; // utils.js
-    var isPath = __dependency5__.isPath;
+
+    // returns true if the passed path is just a keyName
+    function isKeyName(path) {
+      return path.indexOf('.') === -1;
+    }
 
     /**
       Starts watching a property on an object. Whenever the property changes,
@@ -19476,7 +18288,7 @@ enifed("ember-metal/watching",
       // can't watch length on Array - it is special...
       if (_keyPath === 'length' && typeOf(obj) === 'array') { return; }
 
-      if (!isPath(_keyPath)) {
+      if (isKeyName(_keyPath)) {
         watchKey(obj, _keyPath, m);
       } else {
         watchPath(obj, _keyPath, m);
@@ -19486,7 +18298,7 @@ enifed("ember-metal/watching",
     __exports__.watch = watch;
 
     function isWatching(obj, key) {
-      var meta = obj['__ember_meta__'];
+      var meta = obj[META_KEY];
       return (meta && meta.watching[key]) > 0;
     }
 
@@ -19496,7 +18308,7 @@ enifed("ember-metal/watching",
       // can't watch length on Array - it is special...
       if (_keyPath === 'length' && typeOf(obj) === 'array') { return; }
 
-      if (!isPath(_keyPath)) {
+      if (isKeyName(_keyPath)) {
         unwatchKey(obj, _keyPath, m);
       } else {
         unwatchPath(obj, _keyPath, m);
@@ -19514,7 +18326,7 @@ enifed("ember-metal/watching",
       @param obj
     */
     function rewatch(obj) {
-      var m = obj['__ember_meta__'], chains = m && m.chains;
+      var m = obj[META_KEY], chains = m && m.chains;
 
       // make sure the object has its own guid.
       if (GUID_KEY in obj && !obj.hasOwnProperty(GUID_KEY)) {
@@ -19539,9 +18351,9 @@ enifed("ember-metal/watching",
       @return {void}
     */
     function destroy(obj) {
-      var meta = obj['__ember_meta__'], node, nodes, key, nodeObject;
+      var meta = obj[META_KEY], node, nodes, key, nodeObject;
       if (meta) {
-        obj['__ember_meta__'] = null;
+        obj[META_KEY] = null;
         // remove chainWatchers to remove circular references that would prevent GC
         node = meta.chains;
         if (node) {
@@ -19572,7 +18384,7 @@ enifed("ember-metal/watching",
 
     __exports__.destroy = destroy;
   });
-enifed("ember-routing-handlebars",
+define("ember-routing-handlebars",
   ["ember-metal/core","ember-handlebars","ember-routing/system/router","ember-routing-handlebars/helpers/shared","ember-routing-handlebars/helpers/link_to","ember-routing-handlebars/helpers/outlet","ember-routing-handlebars/helpers/render","ember-routing-handlebars/helpers/action","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -19594,7 +18406,6 @@ enifed("ember-routing-handlebars",
     var deprecatedLinkToHelper = __dependency5__.deprecatedLinkToHelper;
     var linkToHelper = __dependency5__.linkToHelper;
     var LinkView = __dependency5__.LinkView;
-    var queryParamsHelper = __dependency5__.queryParamsHelper;
 
     var outletHelper = __dependency6__.outletHelper;
     var OutletView = __dependency6__.OutletView;
@@ -19616,13 +18427,12 @@ enifed("ember-routing-handlebars",
     EmberHandlebars.registerHelper('outlet', outletHelper);
     EmberHandlebars.registerHelper('link-to', linkToHelper);
     EmberHandlebars.registerHelper('linkTo', deprecatedLinkToHelper);
-    EmberHandlebars.registerHelper('query-params', queryParamsHelper);
 
     __exports__["default"] = Ember;
   });
-enifed("ember-routing-handlebars/helpers/action",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/utils","ember-metal/run_loop","ember-views/system/utils","ember-views/system/action_manager","ember-routing/system/router","ember-handlebars","ember-handlebars/ext","ember-handlebars/helpers/view","ember-routing-handlebars/helpers/shared","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+define("ember-routing-handlebars/helpers/action",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/utils","ember-metal/run_loop","ember-views/system/utils","ember-routing/system/router","ember-handlebars","ember-handlebars/ext","ember-handlebars/helpers/view","ember-routing-handlebars/helpers/shared","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Handlebars, uuid, FEATURES, assert, deprecate
@@ -19632,14 +18442,13 @@ enifed("ember-routing-handlebars/helpers/action",
     var run = __dependency5__["default"];
 
     var isSimpleClick = __dependency6__.isSimpleClick;
-    var ActionManager = __dependency7__["default"];
-    var EmberRouter = __dependency8__["default"];
+    var EmberRouter = __dependency7__["default"];
 
-    var EmberHandlebars = __dependency9__["default"];
-    var handlebarsGet = __dependency10__.handlebarsGet;
-    var viewHelper = __dependency11__.viewHelper;
-    var resolveParams = __dependency12__.resolveParams;
-    var resolvePath = __dependency12__.resolvePath;
+    var EmberHandlebars = __dependency8__["default"];
+    var handlebarsGet = __dependency9__.handlebarsGet;
+    var viewHelper = __dependency10__.viewHelper;
+    var resolveParams = __dependency11__.resolveParams;
+    var resolvePath = __dependency11__.resolvePath;
 
     /**
     @module ember
@@ -19653,17 +18462,15 @@ enifed("ember-routing-handlebars/helpers/action",
       var ret = [];
       if (actionName) { ret.push(actionName); }
 
-      var types = options.options.types.slice(1);
-      var data = options.options.data;
+      var types = options.options.types.slice(1),
+          data = options.options.data;
 
       return ret.concat(resolveParams(options.context, options.params, { types: types, data: data }));
     }
 
-    var ActionHelper = {};
-
-    // registeredActions is re-exported for compatibility with older plugins
-    // that were using this undocumented API.
-    ActionHelper.registeredActions = ActionManager.registeredActions;
+    var ActionHelper = {
+      registeredActions: {}
+    };
 
     __exports__.ActionHelper = ActionHelper;
 
@@ -19695,20 +18502,10 @@ enifed("ember-routing-handlebars/helpers/action",
       return allowed;
     };
 
-    function isKeyEvent(eventName) {
-      return ['keyUp', 'keyPress', 'keyDown'].indexOf(eventName) !== -1;
-    }
-
-    function ignoreKeyEvent(eventName, event, keyCode) {
-      var any = 'any';
-      keyCode = keyCode || any;
-      return isKeyEvent(eventName) && keyCode !== any && keyCode !== event.which.toString();
-    }
-
     ActionHelper.registerAction = function(actionNameOrPath, options, allowedKeys) {
       var actionId = uuid();
 
-      ActionManager.registeredActions[actionId] = {
+      ActionHelper.registeredActions[actionId] = {
         eventName: options.eventName,
         handler: function handleRegisteredAction(event) {
           if (!isAllowedEvent(event, allowedKeys)) { return true; }
@@ -19721,12 +18518,10 @@ enifed("ember-routing-handlebars/helpers/action",
             event.stopPropagation();
           }
 
-          var target = options.target;
-          var parameters = options.parameters;
-          var eventName = options.eventName;
-          var actionName;
+          var target = options.target,
+              parameters = options.parameters,
+              actionName;
 
-          
           if (target.target) {
             target = handlebarsGet(target.root, target.target, target.options);
           } else {
@@ -19756,25 +18551,24 @@ enifed("ember-routing-handlebars/helpers/action",
       };
 
       options.view.on('willClearRender', function() {
-        delete ActionManager.registeredActions[actionId];
+        delete ActionHelper.registeredActions[actionId];
       });
 
       return actionId;
     };
 
     /**
+      The `{{action}}` helper registers an HTML element within a template for DOM
+      event handling and forwards that interaction to the templates's controller
+      or supplied `target` option (see 'Specifying a Target').
 
-      The `{{action}}` helper provides a useful shortcut for registering an HTML
-      element within a template for a single DOM event and forwarding that
-      interaction to the template's controller or specified `target` option.
-
-      If the controller does not implement the specified action, the event is sent
+      If the controller does not implement the event, the event is sent
       to the current route, and it bubbles up the route hierarchy from there.
 
-      For more advanced event handling see [Ember.Component](/api/classes/Ember.Component.html)
+      User interaction with that element will invoke the supplied action name on
+      the appropriate target. Specifying a non-quoted action name will result in
+      a bound property lookup at the time the event will be triggered.
 
-
-      ### Use
       Given the following application Handlebars template on the page
 
       ```handlebars
@@ -19854,6 +18648,12 @@ enifed("ember-routing-handlebars/helpers/action",
       See `Ember.View` 'Responding to Browser Events' for a list of
       acceptable DOM event names.
 
+      NOTE: Because `{{action}}` depends on Ember's event dispatch system it will
+      only function if an `Ember.EventDispatcher` instance is available. An
+      `Ember.EventDispatcher` instance will be created when a new `Ember.Application`
+      is created. Having an instance of `Ember.Application` will satisfy this
+      requirement.
+
       ### Specifying whitelisted modifier keys
 
       By default the `{{action}}` helper will ignore click event with pressed modifier
@@ -19879,7 +18679,7 @@ enifed("ember-routing-handlebars/helpers/action",
 
       There are several possible target objects for `{{action}}` helpers:
 
-      In a typical Ember application, where templates are managed through use of the
+      In a typical Ember application, where views are managed through use of the
       `{{outlet}}` helper, actions will bubble to the current controller, then
       to the current route, and then up the route hierarchy.
 
@@ -19927,10 +18727,11 @@ enifed("ember-routing-handlebars/helpers/action",
       @param {Hash} options
     */
     function actionHelper(actionName) {
-      var options = arguments[arguments.length - 1];
-      var contexts = a_slice.call(arguments, 1, -1);
-      var hash = options.hash;
-      var controller = options.data.keywords.controller;
+      var options = arguments[arguments.length - 1],
+          contexts = a_slice.call(arguments, 1, -1);
+
+      var hash = options.hash,
+          controller = options.data.keywords.controller;
 
       // create a hash to pass along to registerAction
       var action = {
@@ -19944,7 +18745,6 @@ enifed("ember-routing-handlebars/helpers/action",
         bubbles: hash.bubbles,
         preventDefault: hash.preventDefault,
         target: { options: options },
-        withKeyCode: hash.withKeyCode,
         boundProperty: options.types[0] === "ID"
       };
 
@@ -19961,8 +18761,8 @@ enifed("ember-routing-handlebars/helpers/action",
 
     __exports__.actionHelper = actionHelper;
   });
-enifed("ember-routing-handlebars/helpers/link_to",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-runtime/system/lazy_load","ember-runtime/system/string","ember-runtime/system/object","ember-metal/keys","ember-views/system/utils","ember-views/views/component","ember-handlebars","ember-handlebars/helpers/view","ember-routing/system/router","ember-routing-handlebars/helpers/shared","exports"],
+define("ember-routing-handlebars/helpers/link_to",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-runtime/system/lazy_load","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/keys","ember-views/system/utils","ember-views/views/component","ember-handlebars","ember-handlebars/helpers/view","ember-routing/system/router","ember-routing-handlebars/helpers/shared","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -20012,8 +18812,8 @@ enifed("ember-routing-handlebars/helpers/link_to",
 
     function getResolvedPaths(options) {
 
-      var types = options.options.types;
-      var data = options.options.data;
+      var types = options.options.types,
+          data = options.options.data;
 
       return resolvePaths(options.context, options.params, { types: types, data: data });
     }
@@ -20034,20 +18834,8 @@ enifed("ember-routing-handlebars/helpers/link_to",
     **/
     var LinkView = Ember.LinkView = EmberComponent.extend({
       tagName: 'a',
-
-      /**
-        @deprecated Use current-when instead.
-        @property currentWhen
-      */
       currentWhen: null,
 
-      /**
-        Used to determine when this LinkView is active.
-
-        @property currentWhen
-      */
-      'current-when': null,
-
       /**
         Sets the `title` attribute of the `LinkView`'s HTML element.
 
@@ -20177,7 +18965,6 @@ enifed("ember-routing-handlebars/helpers/link_to",
       init: function() {
         this._super.apply(this, arguments);
 
-        
         // Map desired event name to invoke function
         var eventName = get(this, 'eventName');
         this.on(eventName, this, this._invoke);
@@ -20203,11 +18990,11 @@ enifed("ember-routing-handlebars/helpers/link_to",
        @since 1.3.0
       **/
       _setupPathObservers: function(){
-        var helperParameters = this.parameters;
-        var linkTextPath = helperParameters.options.linkTextPath;
-        var paths = getResolvedPaths(helperParameters);
-        var length = paths.length;
-        var path, i, normalizedPath;
+        var helperParameters = this.parameters,
+            linkTextPath     = helperParameters.options.linkTextPath,
+            paths = getResolvedPaths(helperParameters),
+            length = paths.length,
+            path, i, normalizedPath;
 
         if (linkTextPath) {
           normalizedPath = getNormalizedPath(linkTextPath, helperParameters);
@@ -20269,9 +19056,6 @@ enifed("ember-routing-handlebars/helpers/link_to",
         or the application's current route is the route the `LinkView` would trigger
         transitions into.
 
-        The `currentWhen` property can match against multiple routes by separating
-        route names using the ` ` (space) character.
-
         @property active
       **/
       active: computed('loadedParams', function computeLinkViewActive() {
@@ -20280,33 +19064,33 @@ enifed("ember-routing-handlebars/helpers/link_to",
         var router = get(this, 'router');
         var loadedParams = get(this, 'loadedParams');
         var contexts = loadedParams.models;
-        var currentWhen = this['current-when'] || this.currentWhen;
+        var currentWhen = this.currentWhen;
         var isCurrentWhenSpecified = Boolean(currentWhen);
         currentWhen = currentWhen || loadedParams.targetRouteName;
 
-        function isActiveForRoute(routeName) {
-          var handlers = router.router.recognizer.handlersFor(routeName);
-          var leafName = handlers[handlers.length-1].handler;
-          var maximumContexts = numberOfContextsAcceptedByHandler(routeName, handlers);
+        var handlers = router.router.recognizer.handlersFor(currentWhen);
+        var leafName = handlers[handlers.length-1].handler;
+        var maximumContexts = numberOfContextsAcceptedByHandler(currentWhen, handlers);
 
-          // NOTE: any ugliness in the calculation of activeness is largely
-          // due to the fact that we support automatic normalizing of
-          // `resource` -> `resource.index`, even though there might be
-          // dynamic segments / query params defined on `resource.index`
-          // which complicates (and makes somewhat ambiguous) the calculation
-          // of activeness for links that link to `resource` instead of
-          // directly to `resource.index`.
+        // NOTE: any ugliness in the calculation of activeness is largely
+        // due to the fact that we support automatic normalizing of
+        // `resource` -> `resource.index`, even though there might be
+        // dynamic segments / query params defined on `resource.index`
+        // which complicates (and makes somewhat ambiguous) the calculation
+        // of activeness for links that link to `resource` instead of
+        // directly to `resource.index`.
 
-          // if we don't have enough contexts revert back to full route name
-          // this is because the leaf route will use one of the contexts
-          if (contexts.length > maximumContexts) {
-            routeName = leafName;
-          }
+        // if we don't have enough contexts revert back to full route name
+        // this is because the leaf route will use one of the contexts
+        if (contexts.length > maximumContexts) {
+          currentWhen = leafName;
+        }
 
-          var args = routeArgs(routeName, contexts, null);
-          var isActive = router.isActive.apply(router, args);
-          if (!isActive) { return false; }
+        var args = routeArgs(currentWhen, contexts, null);
+        var isActive = router.isActive.apply(router, args);
+        if (!isActive) { return false; }
 
+        
           var emptyQueryParams = Ember.isEmpty(Ember.keys(loadedParams.queryParams));
 
           if (!isCurrentWhenSpecified && !emptyQueryParams && isActive) {
@@ -20315,18 +19099,10 @@ enifed("ember-routing-handlebars/helpers/link_to",
             router._prepareQueryParams(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
             isActive = shallowEqual(visibleQueryParams, router.router.state.queryParams);
           }
-
-          return isActive;
-        }
-
         
-          currentWhen = currentWhen.split(' ');
-          for (var i = 0, len = currentWhen.length; i < len; i++) {
-            if (isActiveForRoute(currentWhen[i])) {
-              return get(this, 'activeClass');
-            }
-          }
-              }),
+
+        if (isActive) { return get(this, 'activeClass'); }
+      }),
 
       /**
         Accessed as a classname binding to apply the `LinkView`'s `loadingClass`
@@ -20368,11 +19144,9 @@ enifed("ember-routing-handlebars/helpers/link_to",
 
         if (this.preventDefault !== false) {
           
-            var targetAttribute = get(this, 'target');
-            if (!targetAttribute || targetAttribute === '_self') {
-              event.preventDefault();
-            }
-                  }
+            event.preventDefault();
+          
+        }
 
         if (this.bubbles === false) { event.stopPropagation(); }
 
@@ -20383,15 +19157,8 @@ enifed("ember-routing-handlebars/helpers/link_to",
           return false;
         }
 
-        
-          var targetAttribute2 = get(this, 'target');
-          if (targetAttribute2 && targetAttribute2 !== '_self') {
-            return false;
-          }
-        
-
-        var router = get(this, 'router');
-        var loadedParams = get(this, 'loadedParams');
+        var router = get(this, 'router'),
+            loadedParams = get(this, 'loadedParams');
 
         var transition = router._doTransition(loadedParams.targetRouteName, loadedParams.models, loadedParams.queryParams);
         if (get(this, 'replace')) {
@@ -20459,13 +19226,13 @@ enifed("ember-routing-handlebars/helpers/link_to",
         @return {Array}
        */
       resolvedParams: computed('router.url', function() {
-        var parameters = this.parameters;
-        var options = parameters.options;
-        var types = options.types;
-        var data = options.data;
-        var targetRouteName, models;
-        var onlyQueryParamsSupplied = (parameters.params.length === 0);
+        var parameters = this.parameters,
+            options = parameters.options,
+            types = options.types,
+            data = options.data,
+            targetRouteName, models;
 
+        var onlyQueryParamsSupplied = (parameters.params.length === 0);
         if (onlyQueryParamsSupplied) {
           var appController = this.container.lookup('controller:application');
           targetRouteName = get(appController, 'currentRouteName');
@@ -20498,8 +19265,8 @@ enifed("ember-routing-handlebars/helpers/link_to",
         var router = get(this, 'router');
         if (!router) { return; }
 
-        var resolvedParams = get(this, 'resolvedParams');
-        var namedRoute = resolvedParams.targetRouteName;
+        var resolvedParams = get(this, 'resolvedParams'),
+            namedRoute = resolvedParams.targetRouteName;
 
         if (!namedRoute) { return; }
 
@@ -20523,16 +19290,18 @@ enifed("ember-routing-handlebars/helpers/link_to",
       href: computed('loadedParams', function computeLinkViewHref() {
         if (get(this, 'tagName') !== 'a') { return; }
 
-        var router = get(this, 'router');
-        var loadedParams = get(this, 'loadedParams');
+        var router = get(this, 'router'),
+            loadedParams = get(this, 'loadedParams');
 
         if (!loadedParams) {
           return get(this, 'loadingHref');
         }
 
         var visibleQueryParams = {};
-        merge(visibleQueryParams, loadedParams.queryParams);
-        router._prepareQueryParams(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
+        
+          merge(visibleQueryParams, loadedParams.queryParams);
+          router._prepareQueryParams(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
+        
 
         var args = routeArgs(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
         var result = router.generate.apply(router, args);
@@ -20553,19 +19322,6 @@ enifed("ember-routing-handlebars/helpers/link_to",
     LinkView.toString = function() { return "LinkView"; };
 
     
-      LinkView.reopen({
-        attributeBindings: ['target'],
-
-        /**
-          Sets the `target` attribute of the `LinkView`'s anchor element.
-
-          @property target
-          @default null
-        **/
-        target: null
-      });
-    
-
     /**
       The `{{link-to}}` helper renders a link to the supplied
       `routeName` passing an optionally supplied model to the
@@ -20829,9 +19585,9 @@ enifed("ember-routing-handlebars/helpers/link_to",
       @see {Ember.LinkView}
     */
     function linkToHelper(name) {
-      var options = slice.call(arguments, -1)[0];
-      var params = slice.call(arguments, 0, -1);
-      var hash = options.hash;
+      var options = slice.call(arguments, -1)[0],
+          params = slice.call(arguments, 0, -1),
+          hash = options.hash;
 
       
       if (params[params.length - 1] instanceof QueryParams) {
@@ -20867,21 +19623,18 @@ enifed("ember-routing-handlebars/helpers/link_to",
       return viewHelper.call(this, LinkView, options);
     }
 
-    /**
-      @method query-params
-      @for Ember.Handlebars.helpers
-      @param {Object} hash takes a hash of query parameters
-      @return {String} HTML string
-    */
-    function queryParamsHelper(options) {
-      
-      return QueryParams.create({
-        values: options.hash,
-        types: options.hashTypes
-      });
-    }
 
-    __exports__.queryParamsHelper = queryParamsHelper;/**
+    
+      EmberHandlebars.registerHelper('query-params', function queryParamsHelper(options) {
+        
+        return QueryParams.create({
+          values: options.hash,
+          types: options.hashTypes
+        });
+      });
+    
+
+    /**
       See [link-to](/api/classes/Ember.Handlebars.helpers.html#method_link-to)
 
       @method linkTo
@@ -20896,9 +19649,9 @@ enifed("ember-routing-handlebars/helpers/link_to",
     }
 
     function getResolvedQueryParams(linkView, targetRouteName) {
-      var helperParameters = linkView.parameters;
-      var queryParamsObject = linkView.queryParamsObject;
-      var resolvedQueryParams = {};
+      var helperParameters = linkView.parameters,
+          queryParamsObject = linkView.queryParamsObject,
+          resolvedQueryParams = {};
 
       if (!queryParamsObject) { return resolvedQueryParams; }
       var rawParams = queryParamsObject.values;
@@ -20906,8 +19659,8 @@ enifed("ember-routing-handlebars/helpers/link_to",
       for (var key in rawParams) {
         if (!rawParams.hasOwnProperty(key)) { continue; }
 
-        var value = rawParams[key];
-        var type = queryParamsObject.types[key];
+        var value = rawParams[key],
+            type = queryParamsObject.types[key];
 
         if (type === 'ID') {
           var normalizedPath = getNormalizedPath(value, helperParameters);
@@ -20947,7 +19700,7 @@ enifed("ember-routing-handlebars/helpers/link_to",
     __exports__.deprecatedLinkToHelper = deprecatedLinkToHelper;
     __exports__.linkToHelper = linkToHelper;
   });
-enifed("ember-routing-handlebars/helpers/outlet",
+define("ember-routing-handlebars/helpers/outlet",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-views/views/container_view","ember-handlebars/views/metamorph_view","ember-handlebars/helpers/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
@@ -21073,7 +19826,7 @@ enifed("ember-routing-handlebars/helpers/outlet",
 
     __exports__.outletHelper = outletHelper;
   });
-enifed("ember-routing-handlebars/helpers/render",
+define("ember-routing-handlebars/helpers/render",
   ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-routing/system/generate_controller","ember-handlebars/ext","ember-handlebars/helpers/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -21086,7 +19839,7 @@ enifed("ember-routing-handlebars/helpers/render",
     var generateControllerFactory = __dependency6__.generateControllerFactory;
     var generateController = __dependency6__["default"];
     var handlebarsGet = __dependency7__.handlebarsGet;
-    var ViewHelper = __dependency8__.ViewHelper;
+    var viewHelper = __dependency8__.viewHelper;
 
 
     /**
@@ -21166,8 +19919,9 @@ enifed("ember-routing-handlebars/helpers/render",
     */
     __exports__["default"] = function renderHelper(name, contextString, options) {
       var length = arguments.length;
-      var contextProvided = length === 3;
-      var container, router, controller, view, context, lookupOptions;
+
+      var contextProvided = length === 3,
+          container, router, controller, view, context, lookupOptions;
 
       container = (options || contextString).data.keywords.controller.container;
       router = container.lookup('router:main');
@@ -21245,10 +19999,10 @@ enifed("ember-routing-handlebars/helpers/render",
 
       options.helperName = options.helperName || ('render "' + name + '"');
 
-      ViewHelper.instanceHelper(this, view, options);
+      viewHelper.call(this, view, options);
     }
   });
-enifed("ember-routing-handlebars/helpers/shared",
+define("ember-routing-handlebars/helpers/shared",
   ["ember-metal/property_get","ember-metal/array","ember-runtime/mixins/controller","ember-handlebars/ext","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -21317,8 +20071,8 @@ enifed("ember-routing-handlebars/helpers/shared",
     }
 
     __exports__.stashParamNames = stashParamNames;function resolvePaths(context, params, options) {
-      var resolved = handlebarsResolve(context, params, options);
-      var types = options.types;
+      var resolved = handlebarsResolve(context, params, options),
+          types = options.types;
 
       return map.call(resolved, function(object, i) {
         if (types[i] === 'ID') {
@@ -21341,7 +20095,7 @@ enifed("ember-routing-handlebars/helpers/shared",
 
     __exports__.resolvePaths = resolvePaths;
   });
-enifed("ember-routing",
+define("ember-routing",
   ["ember-handlebars","ember-metal/core","ember-routing/ext/run_loop","ember-routing/ext/controller","ember-routing/ext/view","ember-routing/location/api","ember-routing/location/none_location","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/system/generate_controller","ember-routing/system/controller_for","ember-routing/system/dsl","ember-routing/system/router","ember-routing/system/route","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
     "use strict";
@@ -21386,7 +20140,7 @@ enifed("ember-routing",
 
     __exports__["default"] = Ember;
   });
-enifed("ember-routing/ext/controller",
+define("ember-routing/ext/controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/utils","ember-metal/merge","ember-metal/enumerable_utils","ember-runtime/mixins/controller","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -21408,143 +20162,6 @@ enifed("ember-routing/ext/controller",
     */
 
     ControllerMixin.reopen({
-      concatenatedProperties: ['queryParams', '_pCacheMeta'],
-
-      init: function() {
-        this._super.apply(this, arguments);
-        listenForQueryParamChanges(this);
-      },
-
-      /**
-        @property queryParams
-        @public
-      */
-      queryParams: null,
-
-      /**
-        @property _qpDelegate
-        @private
-      */
-      _qpDelegate: null,
-
-      /**
-        @property _normalizedQueryParams
-        @private
-      */
-      _normalizedQueryParams: computed(function() {
-        var m = meta(this);
-        if (m.proto !== this) {
-          return get(m.proto, '_normalizedQueryParams');
-        }
-
-        var queryParams = get(this, 'queryParams');
-        if (queryParams._qpMap) {
-          return queryParams._qpMap;
-        }
-
-        var qpMap = queryParams._qpMap = {};
-
-        for (var i = 0, len = queryParams.length; i < len; ++i) {
-          accumulateQueryParamDescriptors(queryParams[i], qpMap);
-        }
-
-        return qpMap;
-      }),
-
-      /**
-        @property _cacheMeta
-        @private
-      */
-      _cacheMeta: computed(function() {
-        var m = meta(this);
-        if (m.proto !== this) {
-          return get(m.proto, '_cacheMeta');
-        }
-
-        var cacheMeta = {};
-        var qpMap = get(this, '_normalizedQueryParams');
-        for (var prop in qpMap) {
-          if (!qpMap.hasOwnProperty(prop)) { continue; }
-
-          var qp = qpMap[prop];
-          var scope = qp.scope;
-          var parts;
-
-          if (scope === 'controller') {
-            parts = [];
-          }
-
-          cacheMeta[prop] = {
-            parts: parts, // provided by route if 'model' scope
-            values: null, // provided by route
-            scope: scope,
-            prefix: "",
-            def: get(this, prop)
-          };
-        }
-
-        return cacheMeta;
-      }),
-
-      /**
-        @method _updateCacheParams
-        @private
-      */
-      _updateCacheParams: function(params) {
-        var cacheMeta = get(this, '_cacheMeta');
-        for (var prop in cacheMeta) {
-          if (!cacheMeta.hasOwnProperty(prop)) { continue; }
-          var propMeta = cacheMeta[prop];
-          propMeta.values = params;
-
-          var cacheKey = this._calculateCacheKey(propMeta.prefix, propMeta.parts, propMeta.values);
-          var cache = this._bucketCache;
-
-          if (cache) {
-            var value = cache.lookup(cacheKey, prop, propMeta.def);
-            set(this, prop, value);
-          }
-        }
-      },
-
-      /**
-        @method _qpChanged
-        @private
-      */
-      _qpChanged: function(controller, _prop) {
-        var prop = _prop.substr(0, _prop.length-3);
-        var cacheMeta = get(controller, '_cacheMeta');
-        var propCache = cacheMeta[prop];
-        var cacheKey = controller._calculateCacheKey(propCache.prefix || "", propCache.parts, propCache.values);
-        var value = get(controller, prop);
-
-        // 1. Update model-dep cache
-        var cache = this._bucketCache;
-        if (cache) {
-          controller._bucketCache.stash(cacheKey, prop, value);
-        }
-
-        // 2. Notify a delegate (e.g. to fire a qp transition)
-        var delegate = controller._qpDelegate;
-        if (delegate) {
-          delegate(controller, prop);
-        }
-      },
-
-      /**
-        @method _calculateCacheKey
-        @private
-      */
-      _calculateCacheKey: function(prefix, _parts, values) {
-        var parts = _parts || [], suffixes = "";
-        for (var i = 0, len = parts.length; i < len; ++i) {
-          var part = parts[i];
-          var value = get(values, part);
-          suffixes += "::" + part + ":" + value;
-        }
-        return prefix + suffixes.replace(ALL_PERIODS_REGEX, '-');
-      },
-
       /**
         Transition the application into another route. The route may
         be either a single route or route path:
@@ -21691,6 +20308,117 @@ enifed("ember-routing/ext/controller",
 
     var ALL_PERIODS_REGEX = /\./g;
 
+    
+      ControllerMixin.reopen({
+        init: function() {
+          this._super.apply(this, arguments);
+          listenForQueryParamChanges(this);
+        },
+
+        concatenatedProperties: ['queryParams', '_pCacheMeta'],
+        queryParams: null,
+
+        _qpDelegate: null,
+        _normalizedQueryParams: computed(function() {
+          var m = meta(this);
+          if (m.proto !== this) {
+            return get(m.proto, '_normalizedQueryParams');
+          }
+
+          var queryParams = get(this, 'queryParams');
+          if (queryParams._qpMap) {
+            return queryParams._qpMap;
+          }
+
+          var qpMap = queryParams._qpMap = {};
+
+          for (var i = 0, len = queryParams.length; i < len; ++i) {
+            accumulateQueryParamDescriptors(queryParams[i], qpMap);
+          }
+
+          return qpMap;
+        }),
+
+        _cacheMeta: computed(function() {
+          var m = meta(this);
+          if (m.proto !== this) {
+            return get(m.proto, '_cacheMeta');
+          }
+
+          var cacheMeta = {};
+          var qpMap = get(this, '_normalizedQueryParams');
+          for (var prop in qpMap) {
+            if (!qpMap.hasOwnProperty(prop)) { continue; }
+
+            var qp = qpMap[prop];
+            var scope = qp.scope;
+            var parts;
+
+            if (scope === 'controller') {
+              parts = [];
+            }
+
+            cacheMeta[prop] = {
+              parts: parts, // provided by route if 'model' scope
+              values: null, // provided by route
+              scope: scope,
+              prefix: "",
+              def: get(this, prop)
+            };
+          }
+
+          return cacheMeta;
+        }),
+
+        _updateCacheParams: function(params) {
+          var cacheMeta = get(this, '_cacheMeta');
+          for (var prop in cacheMeta) {
+            if (!cacheMeta.hasOwnProperty(prop)) { continue; }
+            var propMeta = cacheMeta[prop];
+            propMeta.values = params;
+
+            var cacheKey = this._calculateCacheKey(propMeta.prefix, propMeta.parts, propMeta.values);
+            var cache = this._bucketCache;
+
+            if (cache) {
+              var value = cache.lookup(cacheKey, prop, propMeta.def);
+              set(this, prop, value);
+            }
+          }
+        },
+
+        _qpChanged: function(controller, _prop) {
+          var prop = _prop.substr(0, _prop.length-3);
+          var cacheMeta = get(controller, '_cacheMeta');
+          var propCache = cacheMeta[prop];
+          var cacheKey = controller._calculateCacheKey(propCache.prefix || "", propCache.parts, propCache.values);
+          var value = get(controller, prop);
+
+          // 1. Update model-dep cache
+          var cache = this._bucketCache;
+          if (cache) {
+            controller._bucketCache.stash(cacheKey, prop, value);
+          }
+
+          // 2. Notify a delegate (e.g. to fire a qp transition)
+          var delegate = controller._qpDelegate;
+          if (delegate) {
+            delegate(controller, prop);
+          }
+        },
+
+        _calculateCacheKey: function(prefix, _parts, values) {
+          var parts = _parts || [], suffixes = "";
+          for (var i = 0, len = parts.length; i < len; ++i) {
+            var part = parts[i];
+            var value = get(values, part);
+            suffixes += "::" + part + ":" + value;
+          }
+          return prefix + suffixes.replace(ALL_PERIODS_REGEX, '-');
+        }
+      });
+    
+
     function accumulateQueryParamDescriptors(_desc, accum) {
       var desc = _desc, tmp;
       if (typeOf(desc) === 'string') {
@@ -21725,7 +20453,7 @@ enifed("ember-routing/ext/controller",
 
     __exports__["default"] = ControllerMixin;
   });
-enifed("ember-routing/ext/run_loop",
+define("ember-routing/ext/run_loop",
   ["ember-metal/run_loop"],
   function(__dependency1__) {
     "use strict";
@@ -21744,7 +20472,7 @@ enifed("ember-routing/ext/run_loop",
     var queues = run.queues;
     run._addQueue('routerTransitions', 'actions');
   });
-enifed("ember-routing/ext/view",
+define("ember-routing/ext/view",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-views/views/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -21901,7 +20629,7 @@ enifed("ember-routing/ext/view",
 
     __exports__["default"] = EmberView;
   });
-enifed("ember-routing/location/api",
+define("ember-routing/location/api",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -22110,7 +20838,7 @@ enifed("ember-routing/location/api",
       }
     };
   });
-enifed("ember-routing/location/auto_location",
+define("ember-routing/location/auto_location",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-routing/location/api","ember-routing/location/history_location","ember-routing/location/hash_location","ember-routing/location/none_location","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
@@ -22466,15 +21194,9 @@ enifed("ember-routing/location/auto_location",
           if (currentPath === historyPath) {
             implementationClass = this._HistoryLocation;
           } else {
-            
-              if (currentPath.substr(0, 2) === '/#') {
-                this._history.replaceState({ path: historyPath }, null, historyPath);
-                implementationClass = this._HistoryLocation;
-              } else {
-                cancelRouterSetup = true;
-                this._replacePath(historyPath);
-              }
-                      }
+            cancelRouterSetup = true;
+            this._replacePath(historyPath);
+          }
 
         } else if (this._getSupportsHashChange()) {
           hashPath = this._getHashPath();
@@ -22502,18 +21224,18 @@ enifed("ember-routing/location/auto_location",
       }
     };
   });
-enifed("ember-routing/location/hash_location",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/object","ember-routing/location/api","exports"],
+define("ember-routing/location/hash_location",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/object","ember-routing/location/api","ember-views/system/jquery","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var run = __dependency4__["default"];
-    var guidFor = __dependency5__.guidFor;
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var run = __dependency3__["default"];
+    var guidFor = __dependency4__.guidFor;
 
-    var EmberObject = __dependency6__["default"];
-    var EmberLocation = __dependency7__["default"];
+    var EmberObject = __dependency5__["default"];
+    var EmberLocation = __dependency6__["default"];
+    var jQuery = __dependency7__["default"];
 
     /**
     @module ember
@@ -22553,8 +21275,7 @@ enifed("ember-routing/location/hash_location",
         @method getURL
       */
       getURL: function() {
-        var path = this.getHash().substr(1);
-                return path;
+        return this.getHash().substr(1);
       },
 
       /**
@@ -22597,7 +21318,7 @@ enifed("ember-routing/location/hash_location",
         var self = this;
         var guid = guidFor(this);
 
-        Ember.$(window).on('hashchange.ember-location-'+guid, function() {
+        jQuery(window).on('hashchange.ember-location-'+guid, function() {
           run(function() {
             var path = self.getURL();
             if (get(self, 'lastSetURL') === path) { return; }
@@ -22633,11 +21354,11 @@ enifed("ember-routing/location/hash_location",
       willDestroy: function() {
         var guid = guidFor(this);
 
-        Ember.$(window).off('hashchange.ember-location-'+guid);
+        jQuery(window).off('hashchange.ember-location-'+guid);
       }
     });
   });
-enifed("ember-routing/location/history_location",
+define("ember-routing/location/history_location",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/object","ember-views/system/jquery","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -22710,9 +21431,11 @@ enifed("ember-routing/location/history_location",
         baseURL = baseURL.replace(/\/$/, '');
 
         var url = path.replace(baseURL, '').replace(rootURL, '');
-        var search = location.search || '';
 
-        url += search;
+        
+          var search = location.search || '';
+          url += search;
+        
 
         return url;
       },
@@ -22863,7 +21586,7 @@ enifed("ember-routing/location/history_location",
       }
     });
   });
-enifed("ember-routing/location/none_location",
+define("ember-routing/location/none_location",
   ["ember-metal/property_get","ember-metal/property_set","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -22958,7 +21681,7 @@ enifed("ember-routing/location/none_location",
       }
     });
   });
-enifed("ember-routing/system/cache",
+define("ember-routing/system/cache",
   ["ember-runtime/system/object","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -22993,7 +21716,7 @@ enifed("ember-routing/system/cache",
       cache: null
     });
   });
-enifed("ember-routing/system/controller_for",
+define("ember-routing/system/controller_for",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -23014,7 +21737,7 @@ enifed("ember-routing/system/controller_for",
       return container.lookup('controller:' + controllerName, lookupOptions);
     }
   });
-enifed("ember-routing/system/dsl",
+define("ember-routing/system/dsl",
   ["ember-metal/core","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -23130,7 +21853,7 @@ enifed("ember-routing/system/dsl",
       return dsl;
     };
   });
-enifed("ember-routing/system/generate_controller",
+define("ember-routing/system/generate_controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -23211,8 +21934,8 @@ enifed("ember-routing/system/generate_controller",
       return instance;
     }
   });
-enifed("ember-routing/system/route",
-  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/get_properties","ember-metal/enumerable_utils","ember-metal/is_none","ember-metal/computed","ember-metal/merge","ember-metal/utils","ember-metal/run_loop","ember-metal/keys","ember-runtime/copy","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/action_handler","ember-routing/system/generate_controller","ember-routing-handlebars/helpers/shared","exports"],
+define("ember-routing/system/route",
+  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/get_properties","ember-metal/enumerable_utils","ember-metal/is_none","ember-metal/computed","ember-metal/merge","ember-metal/utils","ember-metal/run_loop","ember-runtime/keys","ember-runtime/copy","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/action_handler","ember-routing/system/generate_controller","ember-routing-handlebars/helpers/shared","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -23253,280 +21976,6 @@ enifed("ember-routing/system/route",
       @uses Ember.ActionHandler
     */
     var Route = EmberObject.extend(ActionHandler, {
-      /**
-        Configuration hash for this route's queryParams. The possible
-        configuration options and their defaults are as follows
-        (assuming a query param whose URL key is `page`):
-
-        ```js
-        queryParams: {
-          page: {
-            // By default, controller query param properties don't
-            // cause a full transition when they are changed, but
-            // rather only cause the URL to update. Setting
-            // `refreshModel` to true will cause an "in-place"
-            // transition to occur, whereby the model hooks for
-            // this route (and any child routes) will re-fire, allowing
-            // you to reload models (e.g., from the server) using the
-            // updated query param values.
-            refreshModel: false,
-
-            // By default, changes to controller query param properties
-            // cause the URL to update via `pushState`, which means an
-            // item will be added to the browser's history, allowing
-            // you to use the back button to restore the app to the
-            // previous state before the query param property was changed.
-            // Setting `replace` to true will use `replaceState` (or its
-            // hash location equivalent), which causes no browser history
-            // item to be added. This options name and default value are
-            // the same as the `link-to` helper's `replace` option.
-            replace: false
-          }
-        }
-        ```
-
-        @property queryParams
-        @for Ember.Route
-        @type Hash
-      */
-      queryParams: {},
-
-      /**
-        @private
-
-        @property _qp
-      */
-      _qp: computed(function() {
-        var controllerName = this.controllerName || this.routeName;
-        var controllerClass = this.container.lookupFactory('controller:' + controllerName);
-
-        if (!controllerClass) {
-          return defaultQPMeta;
-        }
-
-        var controllerProto = controllerClass.proto();
-        var qpProps = get(controllerProto, '_normalizedQueryParams');
-        var cacheMeta = get(controllerProto, '_cacheMeta');
-
-        var qps = [], map = {}, self = this;
-        for (var propName in qpProps) {
-          if (!qpProps.hasOwnProperty(propName)) { continue; }
-
-          var desc = qpProps[propName];
-          var urlKey = desc.as || this.serializeQueryParamKey(propName);
-          var defaultValue = get(controllerProto, propName);
-
-          if (isArray(defaultValue)) {
-            defaultValue = Ember.A(defaultValue.slice());
-          }
-
-          var type = typeOf(defaultValue);
-          var defaultValueSerialized = this.serializeQueryParam(defaultValue, urlKey, type);
-          var fprop = controllerName + ':' + propName;
-          var qp = {
-            def: defaultValue,
-            sdef: defaultValueSerialized,
-            type: type,
-            urlKey: urlKey,
-            prop: propName,
-            fprop: fprop,
-            ctrl: controllerName,
-            cProto: controllerProto,
-            svalue: defaultValueSerialized,
-            cacheType: desc.scope,
-            route: this,
-            cacheMeta: cacheMeta[propName]
-          };
-
-          map[propName] = map[urlKey] = map[fprop] = qp;
-          qps.push(qp);
-        }
-
-        return {
-          qps: qps,
-          map: map,
-          states: {
-            active: function(controller, prop) {
-              return self._activeQPChanged(controller, map[prop]);
-            },
-            allowOverrides: function(controller, prop) {
-              return self._updatingQPChanged(controller, map[prop]);
-            },
-            changingKeys: function(controller, prop) {
-              return self._updateSerializedQPValue(controller, map[prop]);
-            }
-          }
-        };
-      }),
-
-      /**
-        @private
-
-        @property _names
-      */
-      _names: null,
-
-      /**
-        @private
-
-        @method _stashNames
-      */
-      _stashNames: function(_handlerInfo, dynamicParent) {
-        var handlerInfo = _handlerInfo;
-        if (this._names) { return; }
-        var names = this._names = handlerInfo._names;
-
-        if (!names.length) {
-          handlerInfo = dynamicParent;
-          names = handlerInfo && handlerInfo._names || [];
-        }
-
-        var qps = get(this, '_qp.qps');
-        var len = qps.length;
-
-        var namePaths = new Array(names.length);
-        for (var a = 0, nlen = names.length; a < nlen; ++a) {
-          namePaths[a] = handlerInfo.name + '.' + names[a];
-        }
-
-        for (var i = 0; i < len; ++i) {
-          var qp = qps[i];
-          var cacheMeta = qp.cacheMeta;
-          if (cacheMeta.scope === 'model') {
-            cacheMeta.parts = namePaths;
-          }
-          cacheMeta.prefix = qp.ctrl;
-        }
-      },
-
-      /**
-        @private
-
-        @property _updateSerializedQPValue
-      */
-      _updateSerializedQPValue: function(controller, qp) {
-        var value = get(controller, qp.prop);
-        qp.svalue = this.serializeQueryParam(value, qp.urlKey, qp.type);
-      },
-
-      /**
-        @private
-
-        @property _activeQPChanged
-      */
-      _activeQPChanged: function(controller, qp) {
-        var value = get(controller, qp.prop);
-        this.router._queuedQPChanges[qp.fprop] = value;
-        run.once(this, this._fireQueryParamTransition);
-      },
-
-      /**
-        @private
-        @method _updatingQPChanged
-      */
-      _updatingQPChanged: function(controller, qp) {
-        var router = this.router;
-        if (!router._qpUpdates) {
-          router._qpUpdates = {};
-        }
-        router._qpUpdates[qp.urlKey] = true;
-      },
-
-      mergedProperties: ['events', 'queryParams'],
-
-      /**
-        @method paramsFor
-      */
-      paramsFor: function(name) {
-        var route = this.container.lookup('route:' + name);
-
-        if (!route) {
-          return {};
-        }
-
-        var transition = this.router.router.activeTransition;
-        var state = transition ? transition.state : this.router.router.state;
-
-        var params = {};
-        merge(params, state.params[name]);
-        merge(params, getQueryParamsFor(route, state));
-
-        return params;
-      },
-
-      /**
-        @method serializeQueryParamKey
-      */
-      serializeQueryParamKey: function(controllerPropertyName) {
-        return controllerPropertyName;
-      },
-
-      /**
-        @method serializeQueryParam
-      */
-      serializeQueryParam: function(value, urlKey, defaultValueType) {
-        // urlKey isn't used here, but anyone overriding
-        // can use it to provide serialization specific
-        // to a certain query param.
-        if (defaultValueType === 'array') {
-          return JSON.stringify(value);
-        }
-        return '' + value;
-      },
-
-      /**
-        @method deserializeQueryParam
-      */
-      deserializeQueryParam: function(value, urlKey, defaultValueType) {
-        // urlKey isn't used here, but anyone overriding
-        // can use it to provide deserialization specific
-        // to a certain query param.
-
-        // Use the defaultValueType of the default value (the initial value assigned to a
-        // controller query param property), to intelligently deserialize and cast.
-        if (defaultValueType === 'boolean') {
-          return (value === 'true') ? true : false;
-        } else if (defaultValueType === 'number') {
-          return (Number(value)).valueOf();
-        } else if (defaultValueType === 'array') {
-          return Ember.A(JSON.parse(value));
-        }
-        return value;
-      },
-
-
-      /**
-        @private
-        @property _fireQueryParamTransition
-      */
-      _fireQueryParamTransition: function() {
-        this.transitionTo({ queryParams: this.router._queuedQPChanges });
-        this.router._queuedQPChanges = {};
-      },
-
-      /**
-        A hook you can use to reset controller values either when the model
-        changes or the route is exiting.
-
-        ```js
-        App.ArticlesRoute = Ember.Route.extend({
-          // ...
-
-          resetController: function (controller, isExiting, transition) {
-            if (isExiting) {
-              controller.set('page', 1);
-            }
-          }
-        });
-        ```
-
-        @method resetController
-        @param {Controller} controller instance
-        @param {Boolean} isExiting
-        @param {Object} transition
-        @since 1.7.0
-      */
-      resetController: Ember.K,
 
       /**
         @private
@@ -23545,11 +21994,11 @@ enifed("ember-routing/system/route",
         @since 1.7.0
       */
       _reset: function(isExiting, transition) {
-        var controller = this.controller;
-
-        controller._qpDelegate = get(this, '_qp.states.inactive');
-
-        this.resetController(controller, isExiting, transition);
+        
+          var controller = this.controller;
+          controller._qpDelegate = get(this, '_qp.states.inactive');
+          this.resetController(this.controller, isExiting, transition);
+        
       },
 
       /**
@@ -23804,100 +22253,102 @@ enifed("ember-routing/system/route",
       _actions: {
 
         queryParamsDidChange: function(changed, totalPresent, removed) {
-          var totalChanged = keys(changed).concat(keys(removed));
-          for (var i = 0, len = totalChanged.length; i < len; ++i) {
-            var urlKey = totalChanged[i];
-            var options = get(this.queryParams, urlKey) || {};
-            if (get(options, 'refreshModel')) {
-              this.refresh();
+          
+            var totalChanged = keys(changed).concat(keys(removed));
+            for (var i = 0, len = totalChanged.length; i < len; ++i) {
+              var urlKey = totalChanged[i],
+                  options = get(this.queryParams, urlKey) || {};
+              if (get(options, 'refreshModel')) {
+                this.refresh();
+              }
             }
-          }
-
-          return true;
+            return true;
+          
         },
 
         finalizeQueryParamChange: function(params, finalParams, transition) {
-          if (this.routeName !== 'application') { return true; }
+          
+            if (this.routeName !== 'application') { return true; }
 
-          // Transition object is absent for intermediate transitions.
-          if (!transition) { return; }
+            // Transition object is absent for intermediate transitions.
+            if (!transition) { return; }
 
-          var handlerInfos = transition.state.handlerInfos;
-          var router = this.router;
-          var qpMeta = router._queryParamsFor(handlerInfos[handlerInfos.length-1].name);
-          var changes = router._qpUpdates;
-          var replaceUrl;
+            var handlerInfos = transition.state.handlerInfos;
+            var router = this.router;
+            var qpMeta = router._queryParamsFor(handlerInfos[handlerInfos.length-1].name);
+            var changes = router._qpUpdates;
+            var replaceUrl;
 
-          stashParamNames(router, handlerInfos);
+            stashParamNames(router, handlerInfos);
 
-          for (var i = 0, len = qpMeta.qps.length; i < len; ++i) {
-            var qp = qpMeta.qps[i];
-            var route = qp.route;
-            var controller = route.controller;
-            var presentKey = qp.urlKey in params && qp.urlKey;
+            for (var i = 0, len = qpMeta.qps.length; i < len; ++i) {
+              var qp = qpMeta.qps[i];
+              var route = qp.route;
+              var controller = route.controller;
+              var presentKey = qp.urlKey in params && qp.urlKey;
 
-            // Do a reverse lookup to see if the changed query
-            // param URL key corresponds to a QP property on
-            // this controller.
-            var value, svalue;
-            if (changes && qp.urlKey in changes) {
-              // Value updated in/before setupController
-              value = get(controller, qp.prop);
-              svalue = route.serializeQueryParam(value, qp.urlKey, qp.type);
-            } else {
-              if (presentKey) {
-                svalue = params[presentKey];
-                value = route.deserializeQueryParam(svalue, qp.urlKey, qp.type);
+              // Do a reverse lookup to see if the changed query
+              // param URL key corresponds to a QP property on
+              // this controller.
+              var value, svalue;
+              if (changes && qp.urlKey in changes) {
+                // Value updated in/before setupController
+                value = get(controller, qp.prop);
+                svalue = route.serializeQueryParam(value, qp.urlKey, qp.type);
               } else {
-                // No QP provided; use default value.
-                svalue = qp.sdef;
-                value = copyDefaultValue(qp.def);
-              }
-            }
-
-            controller._qpDelegate = get(this, '_qp.states.inactive');
-
-            var thisQueryParamChanged = (svalue !== qp.svalue);
-            if (thisQueryParamChanged) {
-              var options = get(route, 'queryParams.' + qp.urlKey) || {};
-
-              if (transition.queryParamsOnly && replaceUrl !== false) {
-                var replaceConfigValue = get(options, 'replace');
-                if (replaceConfigValue) {
-                  replaceUrl = true;
-                } else if (replaceConfigValue === false) {
-                  // Explicit pushState wins over any other replaceStates.
-                  replaceUrl = false;
+                if (presentKey) {
+                  svalue = params[presentKey];
+                  value = route.deserializeQueryParam(svalue, qp.urlKey, qp.type);
+                } else {
+                  // No QP provided; use default value.
+                  svalue = qp.sdef;
+                  value = copyDefaultValue(qp.def);
                 }
               }
 
-              set(controller, qp.prop, value);
+              controller._qpDelegate = get(this, '_qp.states.inactive');
+
+              var thisQueryParamChanged = (svalue !== qp.svalue);
+              if (thisQueryParamChanged) {
+                var options = get(route, 'queryParams.' + qp.urlKey) || {};
+
+                if (transition.queryParamsOnly && replaceUrl !== false) {
+                  var replaceConfigValue = get(options, 'replace');
+                  if (replaceConfigValue) {
+                    replaceUrl = true;
+                  } else if (replaceConfigValue === false) {
+                    // Explicit pushState wins over any other replaceStates.
+                    replaceUrl = false;
+                  }
+                }
+
+                set(controller, qp.prop, value);
+              }
+
+              // Stash current serialized value of controller.
+              qp.svalue = svalue;
+
+              var thisQueryParamHasDefaultValue = (qp.sdef === svalue);
+              if (!thisQueryParamHasDefaultValue) {
+                finalParams.push({
+                  value: svalue,
+                  visible: true,
+                  key: presentKey || qp.urlKey
+                });
+              }
             }
 
-            // Stash current serialized value of controller.
-            qp.svalue = svalue;
-
-            var thisQueryParamHasDefaultValue = (qp.sdef === svalue);
-            if (!thisQueryParamHasDefaultValue) {
-              finalParams.push({
-                value: svalue,
-                visible: true,
-                key: presentKey || qp.urlKey
-              });
+            if (replaceUrl) {
+              transition.method('replace');
             }
-          }
 
-          if (replaceUrl) {
-            transition.method('replace');
-          }
-
-          forEach(qpMeta.qps, function(qp) {
-            var routeQpMeta = get(qp.route, '_qp');
-            var finalizedController = qp.route.controller;
-            finalizedController._qpDelegate = get(routeQpMeta, 'states.active');
-          });
-
-          router._qpUpdates = null;
+            forEach(qpMeta.qps, function(qp) {
+              var routeQpMeta = get(qp.route, '_qp');
+              var finalizedController = qp.route.controller;
+              finalizedController._qpDelegate = get(routeQpMeta, 'states.active');
+            });
+            router._qpUpdates = null;
+          
         }
       },
 
@@ -23909,6 +22360,8 @@ enifed("ember-routing/system/route",
       */
       events: null,
 
+      mergedProperties: ['events'],
+
       /**
         This hook is executed when the router completely exits this route. It is
         not executed when the model for the route changes.
@@ -24188,22 +22641,23 @@ enifed("ember-routing/system/route",
         if (this.setupControllers) {
                     this.setupControllers(controller, context);
         } else {
-          var states = get(this, '_qp.states');
-          if (transition) {
-            // Update the model dep values used to calculate cache keys.
-            stashParamNames(this.router, transition.state.handlerInfos);
-            controller._qpDelegate = states.changingKeys;
-            controller._updateCacheParams(transition.params);
-          }
-          controller._qpDelegate = states.allowOverrides;
+          
+            var states = get(this, '_qp.states');
+            if (transition) {
+              // Update the model dep values used to calculate cache keys.
+              stashParamNames(this.router, transition.state.handlerInfos);
+              controller._qpDelegate = states.changingKeys;
+              controller._updateCacheParams(transition.params);
+            }
+            controller._qpDelegate = states.allowOverrides;
 
-          if (transition) {
-            var qpValues = getQueryParamsFor(this, transition.state);
-            controller.setProperties(qpValues);
-          }
+            if (transition) {
+              var qpValues = getQueryParamsFor(this, transition.state);
+              controller.setProperties(qpValues);
+            }
 
-          this.setupController(controller, context, transition);
-        }
+            this.setupController(controller, context, transition);
+                  }
 
         if (this.renderTemplates) {
                     this.renderTemplates(context);
@@ -24369,7 +22823,7 @@ enifed("ember-routing/system/route",
         });
         ```
 
-        The model for the `post` route is `store.find('post', params.post_id)`.
+        The model for the `post` route is `App.Post.find(params.post_id)`.
 
         By default, if your route has a dynamic segment ending in `_id`:
 
@@ -24412,7 +22866,7 @@ enifed("ember-routing/system/route",
         ```js
         App.PostRoute = Ember.Route.extend({
           model: function(params) {
-            return this.store.find('post', params.post_id);
+            return App.Post.find(params.post_id);
           }
         });
         ```
@@ -24429,7 +22883,10 @@ enifed("ember-routing/system/route",
       model: function(params, transition) {
         var match, name, sawParams, value;
 
-        var queryParams = get(this, '_qp.map');
+        var queryParams;
+        
+          queryParams = get(this, '_qp.map');
+        
 
         for (var prop in params) {
           if (prop === 'queryParams' || (queryParams && prop in queryParams)) {
@@ -24445,7 +22902,7 @@ enifed("ember-routing/system/route",
 
         if (!name && sawParams) { return copy(params); }
         else if (!name) {
-          if (transition.resolveIndex < 1) { return; }
+          if (transition.resolveIndex !== transition.state.handlerInfos.length-1) { return; }
 
           var parentModel = transition.state.handlerInfos[transition.resolveIndex-1].context;
 
@@ -24465,8 +22922,9 @@ enifed("ember-routing/system/route",
         Router.js hook.
        */
       deserialize: function(params, transition) {
-        return this.model(this.paramsFor(this.routeName), transition);
-      },
+        
+          return this.model(this.paramsFor(this.routeName), transition);
+              },
 
       /**
 
@@ -24578,7 +23036,7 @@ enifed("ember-routing/system/route",
         ```js
         App.PhotosRoute = Ember.Route.extend({
           model: function() {
-            return this.store.find('photo');
+            return App.Photo.find();
           },
 
           setupController: function (controller, model) {
@@ -24813,7 +23271,7 @@ enifed("ember-routing/system/route",
         // posts route
         Ember.Route.extend({
           renderTemplate: function(){
-            this.render('photos', {
+            this.render('posts', {
               into: 'application',
               outlet: 'anOutletName'
             })
@@ -25031,6 +23489,240 @@ enifed("ember-routing/system/route",
       states: {}
     };
 
+    
+      Route.reopen({
+        /**
+          Configuration hash for this route's queryParams. The possible
+          configuration options and their defaults are as follows
+          (assuming a query param whose URL key is `page`):
+
+          ```js
+          queryParams: {
+            page: {
+              // By default, controller query param properties don't
+              // cause a full transition when they are changed, but
+              // rather only cause the URL to update. Setting
+              // `refreshModel` to true will cause an "in-place"
+              // transition to occur, whereby the model hooks for
+              // this route (and any child routes) will re-fire, allowing
+              // you to reload models (e.g., from the server) using the
+              // updated query param values.
+              refreshModel: false,
+
+              // By default, changes to controller query param properties
+              // cause the URL to update via `pushState`, which means an
+              // item will be added to the browser's history, allowing
+              // you to use the back button to restore the app to the
+              // previous state before the query param property was changed.
+              // Setting `replace` to true will use `replaceState` (or its
+              // hash location equivalent), which causes no browser history
+              // item to be added. This options name and default value are
+              // the same as the `link-to` helper's `replace` option.
+              replace: false
+            }
+          }
+          ```
+
+          @property queryParams
+          @for Ember.Route
+          @type Hash
+        */
+        queryParams: {},
+
+        _qp: computed(function() {
+          var controllerName = this.controllerName || this.routeName;
+          var fullName = this.container.normalize('controller:' + controllerName);
+          var controllerClass = this.container.lookupFactory(fullName);
+
+          if (!controllerClass) {
+            return defaultQPMeta;
+          }
+
+          var controllerProto = controllerClass.proto();
+          var qpProps = get(controllerProto, '_normalizedQueryParams');
+          var cacheMeta = get(controllerProto, '_cacheMeta');
+
+          var qps = [], map = {}, self = this;
+          for (var propName in qpProps) {
+            if (!qpProps.hasOwnProperty(propName)) { continue; }
+
+            var desc = qpProps[propName],
+                urlKey = desc.as || this.serializeQueryParamKey(propName),
+                defaultValue = get(controllerProto, propName);
+
+            if (isArray(defaultValue)) {
+              defaultValue = Ember.A(defaultValue.slice());
+            }
+
+            var type = typeOf(defaultValue),
+                defaultValueSerialized = this.serializeQueryParam(defaultValue, urlKey, type),
+                fprop = controllerName + ':' + propName,
+                qp = {
+                  def: defaultValue,
+                  sdef: defaultValueSerialized,
+                  type: type,
+                  urlKey: urlKey,
+                  prop: propName,
+                  fprop: fprop,
+                  ctrl: controllerName,
+                  cProto: controllerProto,
+                  svalue: defaultValueSerialized,
+                  cacheType: desc.scope,
+                  route: this,
+                  cacheMeta: cacheMeta[propName]
+                };
+
+            map[propName] = map[urlKey] = map[fprop] = qp;
+            qps.push(qp);
+          }
+
+          return {
+            qps: qps,
+            map: map,
+            states: {
+              active: function(controller, prop) {
+                return self._activeQPChanged(controller, map[prop]);
+              },
+              allowOverrides: function(controller, prop) {
+                return self._updatingQPChanged(controller, map[prop]);
+              },
+              changingKeys: function(controller, prop) {
+                return self._updateSerializedQPValue(controller, map[prop]);
+              }
+            }
+          };
+        }),
+
+        _names: null,
+        _stashNames: function(_handlerInfo, dynamicParent) {
+          var handlerInfo = _handlerInfo;
+          if (this._names) { return; }
+          var names = this._names = handlerInfo._names;
+
+          if (!names.length) {
+            handlerInfo = dynamicParent;
+            names = handlerInfo && handlerInfo._names || [];
+          }
+
+          var qps = get(this, '_qp.qps');
+          var len = qps.length;
+
+          var namePaths = new Array(names.length);
+          for (var a = 0, nlen = names.length; a < nlen; ++a) {
+            namePaths[a] = handlerInfo.name + '.' + names[a];
+          }
+
+          for (var i = 0; i < len; ++i) {
+            var qp = qps[i];
+            var cacheMeta = qp.cacheMeta;
+            if (cacheMeta.scope === 'model') {
+              cacheMeta.parts = namePaths;
+            }
+            cacheMeta.prefix = qp.ctrl;
+          }
+        },
+
+        _updateSerializedQPValue: function(controller, qp) {
+          var value = get(controller, qp.prop);
+          qp.svalue = this.serializeQueryParam(value, qp.urlKey, qp.type);
+        },
+
+        _activeQPChanged: function(controller, qp) {
+          var value = get(controller, qp.prop);
+          this.router._queuedQPChanges[qp.fprop] = value;
+          run.once(this, this._fireQueryParamTransition);
+        },
+
+        _updatingQPChanged: function(controller, qp) {
+          var router = this.router;
+          if (!router._qpUpdates) {
+            router._qpUpdates = {};
+          }
+          router._qpUpdates[qp.urlKey] = true;
+        },
+
+        mergedProperties: ['queryParams'],
+
+        paramsFor: function(name) {
+          var route = this.container.lookup('route:' + name);
+
+          if (!route) {
+            return {};
+          }
+
+          var transition = this.router.router.activeTransition;
+          var state = transition ? transition.state : this.router.router.state;
+
+          var params = {};
+          merge(params, state.params[name]);
+          merge(params, getQueryParamsFor(route, state));
+
+          return params;
+        },
+
+        serializeQueryParamKey: function(controllerPropertyName) {
+          return controllerPropertyName;
+        },
+
+        serializeQueryParam: function(value, urlKey, defaultValueType) {
+          // urlKey isn't used here, but anyone overriding
+          // can use it to provide serialization specific
+          // to a certain query param.
+          if (defaultValueType === 'array') {
+            return JSON.stringify(value);
+          }
+          return '' + value;
+        },
+
+        deserializeQueryParam: function(value, urlKey, defaultValueType) {
+          // urlKey isn't used here, but anyone overriding
+          // can use it to provide deserialization specific
+          // to a certain query param.
+
+          // Use the defaultValueType of the default value (the initial value assigned to a
+          // controller query param property), to intelligently deserialize and cast.
+          if (defaultValueType === 'boolean') {
+            return (value === 'true') ? true : false;
+          } else if (defaultValueType === 'number') {
+            return (Number(value)).valueOf();
+          } else if (defaultValueType === 'array') {
+            return Ember.A(JSON.parse(value));
+          }
+          return value;
+        },
+
+
+        _fireQueryParamTransition: function() {
+          this.transitionTo({ queryParams: this.router._queuedQPChanges });
+          this.router._queuedQPChanges = {};
+        },
+
+        /**
+          A hook you can use to reset controller values either when the model
+          changes or the route is exiting.
+
+          ```js
+          App.ArticlesRoute = Ember.Route.extend({
+            // ...
+
+            resetController: function (controller, isExiting, transition) {
+              if (isExiting) {
+                controller.set('page', 1);
+              }
+            }
+          });
+          ```
+
+          @method resetController
+          @param {Controller} controller instance
+          @param {Boolean} isExiting
+          @param {Object} transition
+          @since 1.7.0
+        */
+        resetController: Ember.K
+      });
+    
+
     function parentRoute(route) {
       var handlerInfo = handlerInfoFor(route, route.router.router.state.handlerInfos, -1);
       return handlerInfo && handlerInfo.handler;
@@ -25067,9 +23759,9 @@ enifed("ember-routing/system/route",
       options.LOG_VIEW_LOOKUPS = get(route.router, 'namespace.LOG_VIEW_LOOKUPS');
 
       
-      var controller = options.controller;
-      var model = options.model;
-      var namedController;
+      var controller = options.controller,
+          model = options.model,
+          namedController;
 
       if (options.controller) {
         controller = options.controller;
@@ -25192,9 +23884,9 @@ enifed("ember-routing/system/route",
 
     __exports__["default"] = Route;
   });
-enifed("ember-routing/system/router",
-  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/properties","ember-metal/computed","ember-metal/merge","ember-metal/run_loop","ember-metal/enumerable_utils","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/evented","ember-routing/system/dsl","ember-views/views/view","ember-routing/location/api","ember-handlebars/views/metamorph_view","ember-routing-handlebars/helpers/shared","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
+define("ember-routing/system/router",
+  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/properties","ember-metal/computed","ember-metal/merge","ember-metal/run_loop","ember-metal/enumerable_utils","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/evented","ember-routing/system/dsl","ember-views/views/view","ember-routing/location/api","ember-handlebars/views/metamorph_view","ember-routing-handlebars/helpers/shared","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // FEATURES, Logger, K, assert
@@ -25217,7 +23909,10 @@ enifed("ember-routing/system/router",
     var routeArgs = __dependency17__.routeArgs;
     var getActiveTargetName = __dependency17__.getActiveTargetName;
     var stashParamNames = __dependency17__.stashParamNames;
-    var create = __dependency18__.create;
+
+    // requireModule("ember-handlebars");
+    // requireModule("ember-runtime");
+    // requireModule("ember-views");
 
     /**
     @module ember
@@ -25502,17 +24197,13 @@ enifed("ember-routing/system/router",
           }
         }
 
-        if (location !== null && typeof location === 'object') {
-          if (rootURL && typeof rootURL === 'string') {
-            location.rootURL = rootURL;
-          }
-
-          // ensure that initState is called AFTER the rootURL is set on
-          // the location instance
-          if (typeof location.initState === 'function') {
-            location.initState();
-          }
+        if (rootURL && typeof rootURL === 'string') {
+          location.rootURL = rootURL;
         }
+
+        // ensure that initState is called AFTER the rootURL is set on
+        // the location instance
+        if (typeof location.initState === 'function') { location.initState(); }
       },
 
       _getHandlerFunction: function() {
@@ -25617,8 +24308,10 @@ enifed("ember-routing/system/router",
         var targetRouteName = _targetRouteName || getActiveTargetName(this.router);
         
         var queryParams = {};
-        merge(queryParams, _queryParams);
-        this._prepareQueryParams(targetRouteName, models, queryParams);
+        
+          merge(queryParams, _queryParams);
+          this._prepareQueryParams(targetRouteName, models, queryParams);
+        
 
         var transitionArgs = routeArgs(targetRouteName, models, queryParams);
         var transitionPromise = this.router.transitionTo.apply(this.router, transitionArgs);
@@ -25648,8 +24341,8 @@ enifed("ember-routing/system/router",
           qps: qps
         };
 
-        var routerjs = this.router;
-        var recogHandlerInfos = routerjs.recognizer.handlersFor(leafRouteName);
+        var routerjs = this.router,
+            recogHandlerInfos = routerjs.recognizer.handlersFor(leafRouteName);
 
         for (var i = 0, len = recogHandlerInfos.length; i < len; ++i) {
           var recogHandler = recogHandlerInfos[i];
@@ -25929,8 +24622,8 @@ enifed("ember-routing/system/router",
         return;
       }
 
-      var infos = router.router.currentHandlerInfos;
-      var path = EmberRouter._routePath(infos);
+      var infos = router.router.currentHandlerInfos,
+          path = EmberRouter._routePath(infos);
 
       if (!('currentPath' in appController)) {
         defineProperty(appController, 'currentPath');
@@ -26046,24 +24739,25 @@ enifed("ember-routing/system/router",
     }
 
     function forEachQueryParam(router, targetRouteName, queryParams, callback) {
-      var qpCache = router._queryParamsFor(targetRouteName);
-      var qps = qpCache.qps;
+      
+        var qpCache = router._queryParamsFor(targetRouteName),
+        qps = qpCache.qps;
 
-      for (var key in queryParams) {
-        if (!queryParams.hasOwnProperty(key)) { continue; }
-        var value = queryParams[key];
-        var qp = qpCache.map[key];
+        for (var key in queryParams) {
+          if (!queryParams.hasOwnProperty(key)) { continue; }
+          var value = queryParams[key],
+          qp = qpCache.map[key];
 
-        if (qp) {
-          callback(key, value, qp);
+          if (qp) {
+            callback(key, value, qp);
+          }
         }
-      }
-    }
+          }
 
     __exports__["default"] = EmberRouter;
   });
-enifed("ember-runtime",
-  ["ember-metal","ember-runtime/core","ember-runtime/compare","ember-runtime/copy","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/tracked_array","ember-runtime/system/subarray","ember-runtime/system/container","ember-runtime/system/application","ember-runtime/system/array_proxy","ember-runtime/system/object_proxy","ember-runtime/system/core_object","ember-runtime/system/each_proxy","ember-runtime/system/native_array","ember-runtime/system/set","ember-runtime/system/string","ember-runtime/system/deferred","ember-runtime/system/lazy_load","ember-runtime/mixins/array","ember-runtime/mixins/comparable","ember-runtime/mixins/copyable","ember-runtime/mixins/enumerable","ember-runtime/mixins/freezable","ember-runtime/mixins/-proxy","ember-runtime/mixins/observable","ember-runtime/mixins/action_handler","ember-runtime/mixins/deferred","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/mutable_array","ember-runtime/mixins/target_action_support","ember-runtime/mixins/evented","ember-runtime/mixins/promise_proxy","ember-runtime/mixins/sortable","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/computed/reduce_computed_macros","ember-runtime/controllers/array_controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/controller","ember-runtime/mixins/controller","ember-runtime/ext/rsvp","ember-runtime/ext/string","ember-runtime/ext/function","exports"],
+define("ember-runtime",
+  ["ember-metal","ember-runtime/core","ember-runtime/keys","ember-runtime/compare","ember-runtime/copy","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/tracked_array","ember-runtime/system/subarray","ember-runtime/system/container","ember-runtime/system/application","ember-runtime/system/array_proxy","ember-runtime/system/object_proxy","ember-runtime/system/core_object","ember-runtime/system/each_proxy","ember-runtime/system/native_array","ember-runtime/system/set","ember-runtime/system/string","ember-runtime/system/deferred","ember-runtime/system/lazy_load","ember-runtime/mixins/array","ember-runtime/mixins/comparable","ember-runtime/mixins/copyable","ember-runtime/mixins/enumerable","ember-runtime/mixins/freezable","ember-runtime/mixins/observable","ember-runtime/mixins/action_handler","ember-runtime/mixins/deferred","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/mutable_array","ember-runtime/mixins/target_action_support","ember-runtime/mixins/evented","ember-runtime/mixins/promise_proxy","ember-runtime/mixins/sortable","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/computed/reduce_computed_macros","ember-runtime/controllers/array_controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/controller","ember-runtime/mixins/controller","ember-runtime/ext/rsvp","ember-runtime/ext/string","ember-runtime/ext/function","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __dependency34__, __dependency35__, __dependency36__, __dependency37__, __dependency38__, __dependency39__, __dependency40__, __dependency41__, __dependency42__, __dependency43__, __dependency44__, __exports__) {
     "use strict";
     /**
@@ -26077,35 +24771,35 @@ enifed("ember-runtime",
     // BEGIN IMPORTS
     var Ember = __dependency1__["default"];
     var isEqual = __dependency2__.isEqual;
-    var compare = __dependency3__["default"];
-    var copy = __dependency4__["default"];
+    var keys = __dependency3__["default"];
+    var compare = __dependency4__["default"];
+    var copy = __dependency5__["default"];
 
-    var Namespace = __dependency5__["default"];
-    var EmberObject = __dependency6__["default"];
-    var TrackedArray = __dependency7__["default"];
-    var SubArray = __dependency8__["default"];
-    var Container = __dependency9__["default"];
-    var Application = __dependency10__["default"];
-    var ArrayProxy = __dependency11__["default"];
-    var ObjectProxy = __dependency12__["default"];
-    var CoreObject = __dependency13__["default"];
-    var EachArray = __dependency14__.EachArray;
-    var EachProxy = __dependency14__.EachProxy;
+    var Namespace = __dependency6__["default"];
+    var EmberObject = __dependency7__["default"];
+    var TrackedArray = __dependency8__["default"];
+    var SubArray = __dependency9__["default"];
+    var Container = __dependency10__["default"];
+    var Application = __dependency11__["default"];
+    var ArrayProxy = __dependency12__["default"];
+    var ObjectProxy = __dependency13__["default"];
+    var CoreObject = __dependency14__["default"];
+    var EachArray = __dependency15__.EachArray;
+    var EachProxy = __dependency15__.EachProxy;
 
-    var NativeArray = __dependency15__["default"];
-    var Set = __dependency16__["default"];
-    var EmberStringUtils = __dependency17__["default"];
-    var Deferred = __dependency18__["default"];
-    var onLoad = __dependency19__.onLoad;
-    var runLoadHooks = __dependency19__.runLoadHooks;
+    var NativeArray = __dependency16__["default"];
+    var Set = __dependency17__["default"];
+    var EmberStringUtils = __dependency18__["default"];
+    var Deferred = __dependency19__["default"];
+    var onLoad = __dependency20__.onLoad;
+    var runLoadHooks = __dependency20__.runLoadHooks;
 
-    var EmberArray = __dependency20__["default"];
-    var Comparable = __dependency21__["default"];
-    var Copyable = __dependency22__["default"];
-    var Enumerable = __dependency23__["default"];
-    var Freezable = __dependency24__.Freezable;
-    var FROZEN_ERROR = __dependency24__.FROZEN_ERROR;
-    var _ProxyMixin = __dependency25__["default"];
+    var EmberArray = __dependency21__["default"];
+    var Comparable = __dependency22__["default"];
+    var Copyable = __dependency23__["default"];
+    var Enumerable = __dependency24__["default"];
+    var Freezable = __dependency25__.Freezable;
+    var FROZEN_ERROR = __dependency25__.FROZEN_ERROR;
 
     var Observable = __dependency26__["default"];
     var ActionHandler = __dependency27__["default"];
@@ -26152,6 +24846,7 @@ enifed("ember-runtime",
     Ember.compare = compare;
     Ember.copy = copy;
     Ember.isEqual = isEqual;
+    Ember.keys = keys;
 
     Ember.Array = EmberArray;
 
@@ -26224,41 +24919,34 @@ enifed("ember-runtime",
     Ember.Controller = Controller;
     Ember.ControllerMixin = ControllerMixin;
 
-    Ember._ProxyMixin = _ProxyMixin;
-
     Ember.RSVP = RSVP;
     // END EXPORTS
 
     __exports__["default"] = Ember;
   });
-enifed("ember-runtime/compare",
-  ["ember-metal/utils","ember-runtime/mixins/comparable","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+define("ember-runtime/compare",
+  ["ember-metal/core","ember-metal/utils","ember-runtime/mixins/comparable","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
-    var typeOf = __dependency1__.typeOf;
-    var Comparable = __dependency2__["default"];
+    var Ember = __dependency1__["default"];
+     // for Ember.ORDER_DEFINITION
+    var typeOf = __dependency2__.typeOf;
+    var Comparable = __dependency3__["default"];
 
-    var TYPE_ORDER = {
-      'undefined': 0,
-      'null': 1,
-      'boolean': 2,
-      'number': 3,
-      'string': 4,
-      'array': 5,
-      'object': 6,
-      'instance': 7,
-      'function': 8,
-      'class': 9,
-      'date': 10
-    };
-
-    //
-    // the spaceship operator
-    //
-    function spaceship(a, b) {
-      var diff = a - b;
-      return (diff > 0) - (diff < 0);
-    }
+    // Used by Ember.compare
+    Ember.ORDER_DEFINITION = Ember.ENV.ORDER_DEFINITION || [
+      'undefined',
+      'null',
+      'boolean',
+      'number',
+      'string',
+      'array',
+      'object',
+      'instance',
+      'function',
+      'class',
+      'date'
+    ];
 
     /**
      This will compare two javascript values of possibly different types.
@@ -26284,52 +24972,74 @@ enifed("ember-runtime/compare",
      @return {Number} -1 if v < w, 0 if v = w and 1 if v > w.
     */
     __exports__["default"] = function compare(v, w) {
-      if (v === w) {
-        return 0;
-      }
+      if (v === w) { return 0; }
 
       var type1 = typeOf(v);
       var type2 = typeOf(w);
 
       if (Comparable) {
-        if (type1 ==='instance' && Comparable.detect(v.constructor)) {
+        if (type1==='instance' && Comparable.detect(v.constructor)) {
           return v.constructor.compare(v, w);
         }
 
         if (type2 === 'instance' && Comparable.detect(w.constructor)) {
-          return 1 - w.constructor.compare(w, v);
+          return 1-w.constructor.compare(w, v);
         }
       }
 
-      var res = spaceship(TYPE_ORDER[type1], TYPE_ORDER[type2]);
-      if (res !== 0) {
-        return res;
+      // If we haven't yet generated a reverse-mapping of Ember.ORDER_DEFINITION,
+      // do so now.
+      var mapping = Ember.ORDER_DEFINITION_MAPPING;
+      if (!mapping) {
+        var order = Ember.ORDER_DEFINITION;
+        mapping = Ember.ORDER_DEFINITION_MAPPING = {};
+        var idx, len;
+        for (idx = 0, len = order.length; idx < len;  ++idx) {
+          mapping[order[idx]] = idx;
+        }
+
+        // We no longer need Ember.ORDER_DEFINITION.
+        delete Ember.ORDER_DEFINITION;
       }
 
+      var type1Index = mapping[type1];
+      var type2Index = mapping[type2];
+
+      if (type1Index < type2Index) { return -1; }
+      if (type1Index > type2Index) { return 1; }
+
       // types are equal - so we have to check values now
       switch (type1) {
         case 'boolean':
         case 'number':
-          return spaceship(v,w);
+          if (v < w) { return -1; }
+          if (v > w) { return 1; }
+          return 0;
 
         case 'string':
-          return spaceship(v.localeCompare(w), 0);
+          var comp = v.localeCompare(w);
+          if (comp < 0) { return -1; }
+          if (comp > 0) { return 1; }
+          return 0;
 
         case 'array':
           var vLen = v.length;
           var wLen = w.length;
-          var len = Math.min(vLen, wLen);
-
-          for (var i = 0; i < len; i++) {
-            var r = compare(v[i], w[i]);
-            if (r !== 0) {
-              return r;
-            }
+          var l = Math.min(vLen, wLen);
+          var r = 0;
+          var i = 0;
+          while (r === 0 && i < l) {
+            r = compare(v[i],w[i]);
+            i++;
           }
+          if (r !== 0) { return r; }
 
           // all elements are equal now
           // shorter array should be ordered first
-          return spaceship(vLen, wLen);
+          if (vLen < wLen) { return -1; }
+          if (vLen > wLen) { return 1; }
+          // arrays are equal now
+          return 0;
 
         case 'instance':
           if (Comparable && Comparable.detect(v)) {
@@ -26338,14 +25048,18 @@ enifed("ember-runtime/compare",
           return 0;
 
         case 'date':
-          return spaceship(v.getTime(), w.getTime());
+          var vNum = v.getTime();
+          var wNum = w.getTime();
+          if (vNum < wNum) { return -1; }
+          if (vNum > wNum) { return 1; }
+          return 0;
 
         default:
           return 0;
       }
     }
   });
-enifed("ember-runtime/computed/array_computed",
+define("ember-runtime/computed/array_computed",
   ["ember-metal/core","ember-runtime/computed/reduce_computed","ember-metal/enumerable_utils","ember-metal/platform","ember-metal/observer","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -26385,11 +25099,9 @@ enifed("ember-runtime/computed/array_computed",
     }
 
     ArrayComputedProperty.prototype = o_create(ReduceComputedProperty.prototype);
-
     ArrayComputedProperty.prototype.initialValue = function () {
       return Ember.A();
     };
-
     ArrayComputedProperty.prototype.resetValue = function (array) {
       array.clear();
       return array;
@@ -26522,8 +25234,8 @@ enifed("ember-runtime/computed/array_computed",
         options = a_slice.call(arguments, -1)[0];
       }
 
-      if (typeof options !== 'object') {
-        throw new EmberError('Array Computed Property declared without an options hash');
+      if (typeof options !== "object") {
+        throw new EmberError("Array Computed Property declared without an options hash");
       }
 
       var cp = new ArrayComputedProperty(options);
@@ -26538,9 +25250,9 @@ enifed("ember-runtime/computed/array_computed",
     __exports__.arrayComputed = arrayComputed;
     __exports__.ArrayComputedProperty = ArrayComputedProperty;
   });
-enifed("ember-runtime/computed/reduce_computed",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/property_events","ember-metal/expand_properties","ember-metal/observer","ember-metal/computed","ember-metal/platform","ember-metal/enumerable_utils","ember-runtime/system/tracked_array","ember-runtime/mixins/array","ember-metal/run_loop","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {
+define("ember-runtime/computed/reduce_computed",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/property_events","ember-metal/expand_properties","ember-metal/observer","ember-metal/computed","ember-metal/platform","ember-metal/enumerable_utils","ember-runtime/system/tracked_array","ember-runtime/mixins/array","ember-metal/run_loop","ember-runtime/system/set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert
@@ -26564,6 +25276,7 @@ enifed("ember-runtime/computed/reduce_computed",
     var TrackedArray = __dependency12__["default"];
     var EmberArray = __dependency13__["default"];
     var run = __dependency14__["default"];
+    var Set = __dependency15__["default"];
     var isArray = __dependency4__.isArray;
 
     var cacheSet = cacheFor.set;
@@ -26633,6 +25346,7 @@ enifed("ember-runtime/computed/reduce_computed",
       this.trackedArray = trackedArray;
       this.beforeObserver = null;
       this.observer = null;
+
       this.destroyed = false;
     }
 
@@ -26640,7 +25354,6 @@ enifed("ember-runtime/computed/reduce_computed",
       setValue: function (newValue) {
         this.instanceMeta.setValue(newValue, true);
       },
-
       getValue: function () {
         return this.instanceMeta.getValue();
       },
@@ -26679,9 +25392,9 @@ enifed("ember-runtime/computed/reduce_computed",
       },
 
       setupPropertyObservers: function (dependentKey, itemPropertyKeys) {
-        var dependentArray = get(this.instanceMeta.context, dependentKey);
-        var length = get(dependentArray, 'length');
-        var observerContexts = new Array(length);
+        var dependentArray = get(this.instanceMeta.context, dependentKey),
+            length = get(dependentArray, 'length'),
+            observerContexts = new Array(length);
 
         this.resetTransformations(dependentKey, observerContexts);
 
@@ -26697,9 +25410,11 @@ enifed("ember-runtime/computed/reduce_computed",
       },
 
       teardownPropertyObservers: function (dependentKey, itemPropertyKeys) {
-        var dependentArrayObserver = this;
-        var trackedArray = this.trackedArraysByGuid[dependentKey];
-        var beforeObserver, observer, item;
+        var dependentArrayObserver = this,
+            trackedArray = this.trackedArraysByGuid[dependentKey],
+            beforeObserver,
+            observer,
+            item;
 
         if (!trackedArray) { return; }
 
@@ -26734,7 +25449,6 @@ enifed("ember-runtime/computed/reduce_computed",
         observerContext.beforeObserver = function (obj, keyName) {
           return dependentArrayObserver.itemPropertyWillChange(obj, keyName, observerContext.dependentArray, observerContext);
         };
-
         observerContext.observer = function (obj, keyName) {
           return dependentArrayObserver.itemPropertyDidChange(obj, keyName, observerContext.dependentArray, observerContext);
         };
@@ -26746,7 +25460,6 @@ enifed("ember-runtime/computed/reduce_computed",
 
       trackAdd: function (dependentKey, index, newItems) {
         var trackedArray = this.trackedArraysByGuid[dependentKey];
-
         if (trackedArray) {
           trackedArray.addItems(index, newItems);
         }
@@ -26812,10 +25525,9 @@ enifed("ember-runtime/computed/reduce_computed",
           forEach(itemPropertyKeys, removeObservers, this);
 
           changeMeta = new ChangeMeta(dependentArray, item, itemIndex, this.instanceMeta.propertyName, this.cp, normalizedRemoveCount);
-          this.setValue(removedItem.call(
+          this.setValue( removedItem.call(
             this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
         }
-        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
       },
 
       dependentArrayDidChange: function (dependentArray, index, removedCount, addedCount) {
@@ -26828,15 +25540,13 @@ enifed("ember-runtime/computed/reduce_computed",
         var itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey];
         var length = get(dependentArray, 'length');
         var normalizedIndex = normalizeIndex(index, length, addedCount);
-        var endIndex = normalizedIndex + addedCount;
         var changeMeta, observerContext;
 
-        forEach(dependentArray.slice(normalizedIndex, endIndex), function (item, sliceIndex) {
+        forEach(dependentArray.slice(normalizedIndex, normalizedIndex + addedCount), function (item, sliceIndex) {
           if (itemPropertyKeys) {
-            observerContext = this.createPropertyObserverContext(dependentArray, normalizedIndex + sliceIndex,
-              this.trackedArraysByGuid[dependentKey]);
-            observerContexts[sliceIndex] = observerContext;
-
+            observerContext =
+              observerContexts[sliceIndex] =
+              this.createPropertyObserverContext(dependentArray, normalizedIndex + sliceIndex, this.trackedArraysByGuid[dependentKey]);
             forEach(itemPropertyKeys, function (propertyKey) {
               addBeforeObserver(item, propertyKey, this, observerContext.beforeObserver);
               addObserver(item, propertyKey, this, observerContext.observer);
@@ -26844,10 +25554,10 @@ enifed("ember-runtime/computed/reduce_computed",
           }
 
           changeMeta = new ChangeMeta(dependentArray, item, normalizedIndex + sliceIndex, this.instanceMeta.propertyName, this.cp, addedCount);
-          this.setValue(addedItem.call(
+          this.setValue( addedItem.call(
             this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
         }, this);
-        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
+
         this.trackAdd(dependentKey, normalizedIndex, observerContexts);
       },
 
@@ -26856,26 +25566,25 @@ enifed("ember-runtime/computed/reduce_computed",
 
         if (!this.changedItems[guid]) {
           this.changedItems[guid] = {
-            array: array,
-            observerContext: observerContext,
-            obj: obj,
-            previousValues: {}
+            array:            array,
+            observerContext:  observerContext,
+            obj:              obj,
+            previousValues:   {}
           };
         }
-
         ++this.changedItemCount;
+
         this.changedItems[guid].previousValues[keyName] = get(obj, keyName);
       },
 
-      itemPropertyDidChange: function (obj, keyName, array, observerContext) {
+      itemPropertyDidChange: function(obj, keyName, array, observerContext) {
         if (--this.changedItemCount === 0) {
           this.flushChanges();
         }
       },
 
-      flushChanges: function () {
-        var changedItems = this.changedItems;
-        var key, c, changeMeta;
+      flushChanges: function() {
+        var changedItems = this.changedItems, key, c, changeMeta;
 
         for (key in changedItems) {
           c = changedItems[key];
@@ -26889,9 +25598,7 @@ enifed("ember-runtime/computed/reduce_computed",
           this.setValue(
             this.callbacks.addedItem.call(this.instanceMeta.context, this.getValue(), c.obj, changeMeta, this.instanceMeta.sugarMeta));
         }
-
         this.changedItems = {};
-        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
       }
     };
 
@@ -26923,26 +25630,26 @@ enifed("ember-runtime/computed/reduce_computed",
       }
     }
 
-    function addItems(dependentArray, callbacks, cp, propertyName, meta) {
+    function addItems (dependentArray, callbacks, cp, propertyName, meta) {
       forEach(dependentArray, function (item, index) {
         meta.setValue( callbacks.addedItem.call(
           this, meta.getValue(), item, new ChangeMeta(dependentArray, item, index, propertyName, cp, dependentArray.length), meta.sugarMeta));
       }, this);
-      callbacks.flushedChanges.call(this, meta.getValue(), meta.sugarMeta);
     }
 
     function reset(cp, propertyName) {
-      var callbacks = cp._callbacks();
-      var hadMeta = cp._hasInstanceMeta(this, propertyName);
-      var meta = cp._instanceMeta(this, propertyName);
+      var callbacks = cp._callbacks(),
+          meta;
 
-      if (hadMeta) { meta.setValue(cp.resetValue(meta.getValue())); }
+      if (cp._hasInstanceMeta(this, propertyName)) {
+        meta = cp._instanceMeta(this, propertyName);
+        meta.setValue(cp.resetValue(meta.getValue()));
+      } else {
+        meta = cp._instanceMeta(this, propertyName);
+      }
 
       if (cp.options.initialize) {
-        cp.options.initialize.call(this, meta.getValue(), {
-          property: cp,
-          propertyName: propertyName
-        }, meta.sugarMeta);
+        cp.options.initialize.call(this, meta.getValue(), { property: cp, propertyName: propertyName }, meta.sugarMeta);
       }
     }
 
@@ -26959,15 +25666,16 @@ enifed("ember-runtime/computed/reduce_computed",
       this.context = context;
       this.propertyName = propertyName;
       this.cache = metaFor(context).cache;
+
       this.dependentArrays = {};
       this.sugarMeta = {};
+
       this.initialValue = initialValue;
     }
 
     ReduceComputedPropertyInstanceMeta.prototype = {
       getValue: function () {
         var value = cacheGet(this.cache, this.propertyName);
-
         if (value !== undefined) {
           return value;
         } else {
@@ -27010,11 +25718,11 @@ enifed("ember-runtime/computed/reduce_computed",
 
     __exports__.ReduceComputedProperty = ReduceComputedProperty;
     // TODO: default export
-
     function ReduceComputedProperty(options) {
       var cp = this;
 
       this.options = options;
+
       this._dependentKeys = null;
       // A map of dependentKey -> [itemProperty, ...] that tracks what properties of
       // items in the array we must track to update this property.
@@ -27030,11 +25738,10 @@ enifed("ember-runtime/computed/reduce_computed",
         // coalesce by, in addition to the target and method.
         run.once(this, recompute, propertyName);
       };
-
       var recompute = function(propertyName) {
-        var dependentKeys = cp._dependentKeys;
-        var meta = cp._instanceMeta(this, propertyName);
-        var callbacks = cp._callbacks();
+        var dependentKeys = cp._dependentKeys,
+            meta = cp._instanceMeta(this, propertyName),
+            callbacks = cp._callbacks();
 
         reset.call(this, cp, propertyName);
 
@@ -27043,8 +25750,8 @@ enifed("ember-runtime/computed/reduce_computed",
             
             if (!partiallyRecomputeFor(this, dependentKey)) { return; }
 
-            var dependentArray = get(this, dependentKey);
-            var previousDependentArray = meta.dependentArrays[dependentKey];
+            var dependentArray = get(this, dependentKey),
+                previousDependentArray = meta.dependentArrays[dependentKey];
 
             if (dependentArray === previousDependentArray) {
               // The array may be the same, but our item property keys may have
@@ -27073,7 +25780,6 @@ enifed("ember-runtime/computed/reduce_computed",
           if (!partiallyRecomputeFor(this, dependentKey)) { return; }
 
           var dependentArray = get(this, dependentKey);
-
           if (dependentArray) {
             addItems.call(this, dependentArray, callbacks, cp, propertyName, meta);
           }
@@ -27098,14 +25804,11 @@ enifed("ember-runtime/computed/reduce_computed",
     ReduceComputedProperty.prototype._callbacks = function () {
       if (!this.callbacks) {
         var options = this.options;
-
         this.callbacks = {
           removedItem: options.removedItem || defaultCallback,
-          addedItem: options.addedItem || defaultCallback,
-          flushedChanges: options.flushedChanges || defaultCallback
+          addedItem: options.addedItem || defaultCallback
         };
       }
-
       return this.callbacks;
     };
 
@@ -27114,8 +25817,8 @@ enifed("ember-runtime/computed/reduce_computed",
     };
 
     ReduceComputedProperty.prototype._instanceMeta = function (context, propertyName) {
-      var cacheMeta = metaFor(context).cacheMeta;
-      var meta = cacheMeta[propertyName];
+      var cacheMeta = metaFor(context).cacheMeta,
+          meta = cacheMeta[propertyName];
 
       if (!meta) {
         meta = cacheMeta[propertyName] = new ReduceComputedPropertyInstanceMeta(context, propertyName, this.initialValue());
@@ -27151,35 +25854,33 @@ enifed("ember-runtime/computed/reduce_computed",
     };
 
     ReduceComputedProperty.prototype.property = function () {
-      var cp = this;
-      var args = a_slice.call(arguments);
-      var propertyArgs = {};
-      var match, dependentArrayKey, itemPropertyKey;
+      var cp = this,
+          args = a_slice.call(arguments),
+          propertyArgs = new Set(),
+          match,
+          dependentArrayKey,
+          itemPropertyKey;
 
       forEach(args, function (dependentKey) {
         if (doubleEachPropertyPattern.test(dependentKey)) {
-          throw new EmberError('Nested @each properties not supported: ' + dependentKey);
+          throw new EmberError("Nested @each properties not supported: " + dependentKey);
         } else if (match = eachPropertyPattern.exec(dependentKey)) {
           dependentArrayKey = match[1];
 
-          var itemPropertyKeyPattern = match[2];
-          var addItemPropertyKey = function (itemPropertyKey) {
-            cp.itemPropertyKey(dependentArrayKey, itemPropertyKey);
-          };
+          var itemPropertyKeyPattern = match[2],
+              addItemPropertyKey = function (itemPropertyKey) {
+                cp.itemPropertyKey(dependentArrayKey, itemPropertyKey);
+              };
 
           expandProperties(itemPropertyKeyPattern, addItemPropertyKey);
-          propertyArgs[guidFor(dependentArrayKey)] = dependentArrayKey;
+          propertyArgs.add(dependentArrayKey);
         } else {
-          propertyArgs[guidFor(dependentKey)] = dependentKey;
+          propertyArgs.add(dependentKey);
         }
       });
 
-      var propertyArgsToArray = [];
-      for (var guid in propertyArgs) {
-        propertyArgsToArray.push(propertyArgs[guid]);
-      }
+      return ComputedProperty.prototype.property.apply(this, propertyArgs.toArray());
 
-      return ComputedProperty.prototype.property.apply(this, propertyArgsToArray);
     };
 
     /**
@@ -27315,8 +26016,8 @@ enifed("ember-runtime/computed/reduce_computed",
           // `content.@each.reversedName` above, we would be getting the objects
           // directly and not have access to `reversedName`.
           //
-          var reversedNameA = get(personA, 'reversedName');
-          var reversedNameB = get(personB, 'reversedName');
+          var reversedNameA = get(personA, 'reversedName'),
+              reversedNameB = get(personB, 'reversedName');
 
           return Ember.compare(reversedNameA, reversedNameB);
         })
@@ -27375,12 +26076,12 @@ enifed("ember-runtime/computed/reduce_computed",
         options = a_slice.call(arguments, -1)[0];
       }
 
-      if (typeof options !== 'object') {
-        throw new EmberError('Reduce Computed Property declared without an options hash');
+      if (typeof options !== "object") {
+        throw new EmberError("Reduce Computed Property declared without an options hash");
       }
 
       if (!('initialValue' in options)) {
-        throw new EmberError('Reduce Computed Property declared without an initial value');
+        throw new EmberError("Reduce Computed Property declared without an initial value");
       }
 
       var cp = new ReduceComputedProperty(options);
@@ -27394,9 +26095,9 @@ enifed("ember-runtime/computed/reduce_computed",
 
     __exports__.reduceComputed = reduceComputed;
   });
-enifed("ember-runtime/computed/reduce_computed_macros",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/run_loop","ember-metal/observer","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/system/subarray","ember-metal/keys","ember-runtime/compare","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
+define("ember-runtime/computed/reduce_computed_macros",
+  ["ember-metal/core","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/run_loop","ember-metal/observer","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/system/object_proxy","ember-runtime/system/subarray","ember-runtime/keys","ember-runtime/compare","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -27405,19 +26106,21 @@ enifed("ember-runtime/computed/reduce_computed_macros",
 
     var Ember = __dependency1__["default"];
     // Ember.assert
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var isArray = __dependency4__.isArray;
-    var guidFor = __dependency4__.guidFor;
-    var EmberError = __dependency5__["default"];
-    var forEach = __dependency6__.forEach;
-    var run = __dependency7__["default"];
-    var addObserver = __dependency8__.addObserver;
-    var arrayComputed = __dependency9__.arrayComputed;
-    var reduceComputed = __dependency10__.reduceComputed;
-    var SubArray = __dependency11__["default"];
-    var keys = __dependency12__["default"];
-    var compare = __dependency13__["default"];
+    var merge = __dependency2__["default"];
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var isArray = __dependency5__.isArray;
+    var guidFor = __dependency5__.guidFor;
+    var EmberError = __dependency6__["default"];
+    var forEach = __dependency7__.forEach;
+    var run = __dependency8__["default"];
+    var addObserver = __dependency9__.addObserver;
+    var arrayComputed = __dependency10__.arrayComputed;
+    var reduceComputed = __dependency11__.reduceComputed;
+    var ObjectProxy = __dependency12__["default"];
+    var SubArray = __dependency13__["default"];
+    var keys = __dependency14__["default"];
+    var compare = __dependency15__["default"];
 
     var a_slice = [].slice;
 
@@ -27479,7 +26182,7 @@ enifed("ember-runtime/computed/reduce_computed_macros",
       @param {String} dependentKey
       @return {Ember.ComputedProperty} computes the largest value in the dependentKey's array
     */
-    function max(dependentKey) {
+    function max (dependentKey) {
       return reduceComputed(dependentKey, {
         initialValue: -Infinity,
 
@@ -27549,17 +26252,16 @@ enifed("ember-runtime/computed/reduce_computed_macros",
 
       The callback method you provide should have the following signature.
       `item` is the current item in the iteration.
-      `index` is the integer index of the current item in the iteration.
 
       ```javascript
-      function(item, index);
+      function(item);
       ```
 
       Example
 
       ```javascript
       var Hamster = Ember.Object.extend({
-        excitingChores: Ember.computed.map('chores', function(chore, index) {
+        excitingChores: Ember.computed.map('chores', function(chore) {
           return chore.toUpperCase() + '!';
         })
       });
@@ -27580,7 +26282,7 @@ enifed("ember-runtime/computed/reduce_computed_macros",
     function map(dependentKey, callback) {
       var options = {
         addedItem: function(array, item, changeMeta, instanceMeta) {
-          var mapped = callback.call(this, item, changeMeta.index);
+          var mapped = callback.call(this, item);
           array.insertAt(changeMeta.index, mapped);
           return array;
         },
@@ -27641,25 +26343,24 @@ enifed("ember-runtime/computed/reduce_computed_macros",
 
       The callback method you provide should have the following signature.
       `item` is the current item in the iteration.
-      `index` is the integer index of the current item in the iteration.
 
       ```javascript
-      function(item, index);
+      function(item);
       ```
 
       ```javascript
       var Hamster = Ember.Object.extend({
-        remainingChores: Ember.computed.filter('chores', function(chore, index) {
+        remainingChores: Ember.computed.filter('chores', function(chore) {
           return !chore.done;
         })
       });
 
-      var hamster = Hamster.create({
+      var hamster = Hamster.create({ 
         chores: [
           { name: 'cook', done: true },
           { name: 'clean', done: true },
           { name: 'write more unit tests', done: false }
-        ]
+        ] 
       });
 
       hamster.get('remainingChores'); // [{name: 'write more unit tests', done: false}]
@@ -27677,9 +26378,9 @@ enifed("ember-runtime/computed/reduce_computed_macros",
           instanceMeta.filteredArrayIndexes = new SubArray();
         },
 
-        addedItem: function (array, item, changeMeta, instanceMeta) {
-          var match = !!callback.call(this, item, changeMeta.index);
-          var filterIndex = instanceMeta.filteredArrayIndexes.addItem(changeMeta.index, match);
+        addedItem: function(array, item, changeMeta, instanceMeta) {
+          var match = !!callback.call(this, item),
+              filterIndex = instanceMeta.filteredArrayIndexes.addItem(changeMeta.index, match);
 
           if (match) {
             array.insertAt(filterIndex, item);
@@ -27785,7 +26486,6 @@ enifed("ember-runtime/computed/reduce_computed_macros",
     */
     function uniq() {
       var args = a_slice.call(arguments);
-
       args.push({
         initialize: function(array, changeMeta, instanceMeta) {
           instanceMeta.itemCounts = {};
@@ -27796,25 +26496,22 @@ enifed("ember-runtime/computed/reduce_computed_macros",
 
           if (!instanceMeta.itemCounts[guid]) {
             instanceMeta.itemCounts[guid] = 1;
-            array.pushObject(item);
           } else {
             ++instanceMeta.itemCounts[guid];
           }
+          array.addObject(item);
           return array;
         },
-
         removedItem: function(array, item, _, instanceMeta) {
-          var guid = guidFor(item);
-          var itemCounts = instanceMeta.itemCounts;
+          var guid = guidFor(item),
+              itemCounts = instanceMeta.itemCounts;
 
           if (--itemCounts[guid] === 0) {
             array.removeObject(item);
           }
-
           return array;
         }
       });
-
       return arrayComputed.apply(null, args);
     }
 
@@ -27853,7 +26550,6 @@ enifed("ember-runtime/computed/reduce_computed_macros",
     */
     function intersect() {
       var args = a_slice.call(arguments);
-
       args.push({
         initialize: function (array, changeMeta, instanceMeta) {
           instanceMeta.itemCounts = {};
@@ -27865,22 +26561,16 @@ enifed("ember-runtime/computed/reduce_computed_macros",
           var numberOfDependentArrays = changeMeta.property._dependentKeys.length;
           var itemCounts = instanceMeta.itemCounts;
 
-          if (!itemCounts[itemGuid]) {
-            itemCounts[itemGuid] = {};
-          }
-
-          if (itemCounts[itemGuid][dependentGuid] === undefined) {
-            itemCounts[itemGuid][dependentGuid] = 0;
-          }
+          if (!itemCounts[itemGuid]) { itemCounts[itemGuid] = {}; }
+          if (itemCounts[itemGuid][dependentGuid] === undefined) { itemCounts[itemGuid][dependentGuid] = 0; }
 
           if (++itemCounts[itemGuid][dependentGuid] === 1 &&
               numberOfDependentArrays === keys(itemCounts[itemGuid]).length) {
+
             array.addObject(item);
           }
-
           return array;
         },
-
         removedItem: function(array, item, changeMeta, instanceMeta) {
           var itemGuid = guidFor(item);
           var dependentGuid = guidFor(changeMeta.arrayChanged);
@@ -27899,14 +26589,11 @@ enifed("ember-runtime/computed/reduce_computed_macros",
             if (numberOfArraysItemAppearsIn === 0) {
               delete itemCounts[itemGuid];
             }
-
             array.removeObject(item);
           }
-
           return array;
         }
       });
-
       return arrayComputed.apply(null, args);
     }
 
@@ -27943,13 +26630,12 @@ enifed("ember-runtime/computed/reduce_computed_macros",
     */
     function setDiff(setAProperty, setBProperty) {
       if (arguments.length !== 2) {
-        throw new EmberError('setDiff requires exactly two dependent arrays.');
+        throw new EmberError("setDiff requires exactly two dependent arrays.");
       }
-
       return arrayComputed(setAProperty, setBProperty, {
         addedItem: function (array, item, changeMeta, instanceMeta) {
-          var setA = get(this, setAProperty);
-          var setB = get(this, setBProperty);
+          var setA = get(this, setAProperty),
+              setB = get(this, setBProperty);
 
           if (changeMeta.arrayChanged === setA) {
             if (!setB.contains(item)) {
@@ -27958,13 +26644,12 @@ enifed("ember-runtime/computed/reduce_computed_macros",
           } else {
             array.removeObject(item);
           }
-
           return array;
         },
 
         removedItem: function (array, item, changeMeta, instanceMeta) {
-          var setA = get(this, setAProperty);
-          var setB = get(this, setBProperty);
+          var setA = get(this, setAProperty),
+              setB = get(this, setBProperty);
 
           if (changeMeta.arrayChanged === setB) {
             if (setA.contains(item)) {
@@ -27973,7 +26658,6 @@ enifed("ember-runtime/computed/reduce_computed_macros",
           } else {
             array.removeObject(item);
           }
-
           return array;
         }
       });
@@ -27982,13 +26666,8 @@ enifed("ember-runtime/computed/reduce_computed_macros",
     __exports__.setDiff = setDiff;function binarySearch(array, item, low, high) {
       var mid, midItem, res, guidMid, guidItem;
 
-      if (arguments.length < 4) {
-        high = get(array, 'length');
-      }
-
-      if (arguments.length < 3) {
-        low = 0;
-      }
+      if (arguments.length < 4) { high = get(array, 'length'); }
+      if (arguments.length < 3) { low = 0; }
 
       if (low === high) {
         return low;
@@ -27997,15 +26676,14 @@ enifed("ember-runtime/computed/reduce_computed_macros",
       mid = low + Math.floor((high - low) / 2);
       midItem = array.objectAt(mid);
 
-      guidMid = guidFor(midItem);
-      guidItem = guidFor(item);
+      guidMid = _guidFor(midItem);
+      guidItem = _guidFor(item);
 
       if (guidMid === guidItem) {
         return mid;
       }
 
       res = this.order(midItem, item);
-
       if (res === 0) {
         res = guidMid < guidItem ? -1 : 1;
       }
@@ -28018,9 +26696,18 @@ enifed("ember-runtime/computed/reduce_computed_macros",
       }
 
       return mid;
+
+      function _guidFor(item) {
+        if (SearchProxy.detectInstance(item)) {
+          return guidFor(get(item, 'content'));
+        }
+        return guidFor(item);
+      }
     }
 
 
+    var SearchProxy = ObjectProxy.extend();
+
     /**
       A computed property which returns a new array with all the
       properties from the first dependent array sorted based on a property
@@ -28087,58 +26774,23 @@ enifed("ember-runtime/computed/reduce_computed_macros",
     */
     function sort(itemsKey, sortDefinition) {
       
+      var initFn, sortPropertiesKey;
+
       if (typeof sortDefinition === 'function') {
-        return customSort(itemsKey, sortDefinition);
-      } else {
-        return propertySort(itemsKey, sortDefinition);
-      }
-    }
-
-    __exports__.sort = sort;function customSort(itemsKey, comparator) {
-      return arrayComputed(itemsKey, {
-        initialize: function (array, changeMeta, instanceMeta) {
-          instanceMeta.order = comparator;
+        initFn = function (array, changeMeta, instanceMeta) {
+          instanceMeta.order = sortDefinition;
           instanceMeta.binarySearch = binarySearch;
-          instanceMeta.waitingInsertions = [];
-          instanceMeta.insertWaiting = function() {
-            var index, item;
-            var waiting = instanceMeta.waitingInsertions;
-            instanceMeta.waitingInsertions = [];
-            for (var i=0; i<waiting.length; i++) {
-              item = waiting[i];
-              index = instanceMeta.binarySearch(array, item);
-              array.insertAt(index, item);
-            }
-          };
-          instanceMeta.insertLater = function(item) {
-            this.waitingInsertions.push(item);
-          };
-        },
-
-        addedItem: function (array, item, changeMeta, instanceMeta) {
-          instanceMeta.insertLater(item);
-          return array;
-        },
-
-        removedItem: function (array, item, changeMeta, instanceMeta) {
-          array.removeObject(item);
-          return array;
-        },
-
-        flushedChanges: function(array, instanceMeta) {
-          instanceMeta.insertWaiting();
-        }
-      });
-    }
-
-    function propertySort(itemsKey, sortPropertiesKey) {
-      return arrayComputed(itemsKey, {
-        initialize: function (array, changeMeta, instanceMeta) {
+        };
+      } else {
+        sortPropertiesKey = sortDefinition;
+        initFn = function (array, changeMeta, instanceMeta) {
           function setupSortProperties() {
-            var sortPropertyDefinitions = get(this, sortPropertiesKey);
-            var sortProperties = instanceMeta.sortProperties = [];
-            var sortPropertyAscending = instanceMeta.sortPropertyAscending = {};
-            var sortProperty, idx, asc;
+            var sortPropertyDefinitions = get(this, sortPropertiesKey),
+                sortProperty,
+                sortProperties = instanceMeta.sortProperties = [],
+                sortPropertyAscending = instanceMeta.sortPropertyAscending = {},
+                idx,
+                asc;
 
             
             changeMeta.property.clearItemPropertyKeys(itemsKey);
@@ -28170,17 +26822,17 @@ enifed("ember-runtime/computed/reduce_computed_macros",
           }
 
           addObserver(this, sortPropertiesKey, updateSortPropertiesOnce);
+
           setupSortProperties.call(this);
 
+
           instanceMeta.order = function (itemA, itemB) {
-            var sortProperty, result, asc;
-            var keyA = this.keyFor(itemA);
-            var keyB = this.keyFor(itemB);
+            var isProxy = itemB instanceof SearchProxy,
+                sortProperty, result, asc;
 
             for (var i = 0; i < this.sortProperties.length; ++i) {
               sortProperty = this.sortProperties[i];
-
-              result = compare(keyA[sortProperty], keyB[sortProperty]);
+              result = compare(get(itemA, sortProperty), isProxy ? itemB[sortProperty] : get(itemB, sortProperty));
 
               if (result !== 0) {
                 asc = this.sortPropertyAscending[sortProperty];
@@ -28192,8 +26844,11 @@ enifed("ember-runtime/computed/reduce_computed_macros",
           };
 
           instanceMeta.binarySearch = binarySearch;
-          setupKeyCache(instanceMeta);
-        },
+        };
+      }
+
+      return arrayComputed(itemsKey, {
+        initialize: initFn,
 
         addedItem: function (array, item, changeMeta, instanceMeta) {
           var index = instanceMeta.binarySearch(array, item);
@@ -28202,38 +26857,26 @@ enifed("ember-runtime/computed/reduce_computed_macros",
         },
 
         removedItem: function (array, item, changeMeta, instanceMeta) {
-          var index = instanceMeta.binarySearch(array, item);
+          var proxyProperties, index, searchItem;
+
+          if (changeMeta.previousValues) {
+            proxyProperties = merge({ content: item }, changeMeta.previousValues);
+
+            searchItem = SearchProxy.create(proxyProperties);
+          } else {
+            searchItem = item;
+          }
+
+          index = instanceMeta.binarySearch(array, searchItem);
           array.removeAt(index);
-          instanceMeta.dropKeyFor(item);
           return array;
         }
       });
     }
 
-    function setupKeyCache(instanceMeta) {
-      instanceMeta.keyFor = function(item) {
-        var guid = guidFor(item);
-        if (this.keyCache[guid]) {
-          return this.keyCache[guid];
-        }
-        var sortProperty;
-        var key = {};
-        for (var i = 0; i < this.sortProperties.length; ++i) {
-          sortProperty = this.sortProperties[i];
-          key[sortProperty] = get(item, sortProperty);
-        }
-        return this.keyCache[guid] = key;
-      };
-
-      instanceMeta.dropKeyFor = function(item) {
-        var guid = guidFor(item);
-        this.keyCache[guid] = null;
-      };
-
-      instanceMeta.keyCache = {};
-    }
+    __exports__.sort = sort;
   });
-enifed("ember-runtime/controllers/array_controller",
+define("ember-runtime/controllers/array_controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-runtime/system/array_proxy","ember-runtime/mixins/sortable","ember-runtime/mixins/controller","ember-metal/computed","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -28294,9 +26937,9 @@ enifed("ember-runtime/controllers/array_controller",
       For example:
 
       ```handlebars
-      {{#each post in controller}}
-        <li>{{post.title}} ({{post.titleLength}} characters)</li>
-      {{/each}}
+        {{#each post in controller}}
+          <li>{{post.title}} ({{post.titleLength}} characters)</li>
+        {{/each}}
       ```
 
       ```javascript
@@ -28306,6 +26949,7 @@ enifed("ember-runtime/controllers/array_controller",
 
       App.PostController = Ember.ObjectController.extend({
         // the `title` property will be proxied to the underlying post.
+
         titleLength: function() {
           return this.get('title').length;
         }.property('title')
@@ -28343,22 +26987,10 @@ enifed("ember-runtime/controllers/array_controller",
     __exports__["default"] = ArrayProxy.extend(ControllerMixin, SortableMixin, {
 
       /**
-        The controller used to wrap items, if any. If the value is a string, it will
-        be used to lookup the container for the controller. As an alternative, you
-        can also provide a controller class as the value.
-
-        For example:
-
-        ```javascript
-        App.MyArrayController = Ember.ArrayController.extend({
-          itemController: Ember.ObjectController.extend({
-            //Item Controller Implementation
-          })
-        });
-        ```
+        The controller used to wrap items, if any.
 
         @property itemController
-        @type String | Ember.Controller
+        @type String
         @default null
       */
       itemController: null,
@@ -28399,7 +27031,6 @@ enifed("ember-runtime/controllers/array_controller",
 
         if (idx >= 0 && idx < length) {
           controllerClass = this.lookupItemController(object);
-
           if (controllerClass) {
             return this.controllerAt(idx, object, controllerClass);
           }
@@ -28460,9 +27091,10 @@ enifed("ember-runtime/controllers/array_controller",
       _isVirtual: false,
 
       controllerAt: function(idx, object, controllerClass) {
+        var fullName, subController, parentController;
+
         var container = get(this, 'container');
         var subControllers = this._subControllers;
-        var fullName, subController, subControllerFactory, parentController, options;
 
         if (subControllers.length > idx) {
           subController = subControllers[idx];
@@ -28472,25 +27104,23 @@ enifed("ember-runtime/controllers/array_controller",
           }
         }
 
+        fullName = 'controller:' + controllerClass;
+
+        if (!container.has(fullName)) {
+          throw new EmberError('Could not resolve itemController: "' + controllerClass + '"');
+        }
+
         if (this._isVirtual) {
           parentController = get(this, 'parentController');
         } else {
           parentController = this;
         }
 
-        
-          fullName = 'controller:' + controllerClass;
-
-          if (!container.has(fullName)) {
-            throw new EmberError('Could not resolve itemController: "' + controllerClass + '"');
-          }
-
-          subController = container.lookupFactory(fullName).create({
-            target: parentController,
-            parentController: parentController,
-            model: object
-          });
-        
+        subController = container.lookupFactory(fullName).create({
+          target: parentController,
+          parentController: parentController,
+          model: object
+        });
 
         subControllers[idx] = subController;
 
@@ -28506,7 +27136,6 @@ enifed("ember-runtime/controllers/array_controller",
         if (subControllers.length) {
           for (var i = 0, length = subControllers.length; length > i; i++) {
             controller = subControllers[i];
-
             if (controller) {
               controller.destroy();
             }
@@ -28522,7 +27151,7 @@ enifed("ember-runtime/controllers/array_controller",
       }
     });
   });
-enifed("ember-runtime/controllers/controller",
+define("ember-runtime/controllers/controller",
   ["ember-runtime/system/object","ember-runtime/mixins/controller","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -28542,7 +27171,7 @@ enifed("ember-runtime/controllers/controller",
     */
     __exports__["default"] = EmberObject.extend(Mixin);
   });
-enifed("ember-runtime/controllers/object_controller",
+define("ember-runtime/controllers/object_controller",
   ["ember-runtime/mixins/controller","ember-runtime/system/object_proxy","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -28569,40 +27198,33 @@ enifed("ember-runtime/controllers/object_controller",
     **/
     __exports__["default"] = ObjectProxy.extend(ControllerMixin);
   });
-enifed("ember-runtime/copy",
-  ["ember-metal/enumerable_utils","ember-metal/utils","ember-runtime/system/object","ember-runtime/mixins/copyable","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+define("ember-runtime/copy",
+  ["ember-metal/enumerable_utils","ember-metal/utils","ember-runtime/system/object","ember-runtime/mixins/copyable","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var indexOf = __dependency1__.indexOf;
     var typeOf = __dependency2__.typeOf;
     var EmberObject = __dependency3__["default"];
     var Copyable = __dependency4__["default"];
+    var create = __dependency5__.create;
 
     function _copy(obj, deep, seen, copies) {
       var ret, loc, key;
 
       // primitive data types are immutable, just return them.
-      if (typeof obj !== 'object' || obj === null) {
-        return obj;
-      }
+      if ('object' !== typeof obj || obj===null) return obj;
 
       // avoid cyclical loops
-      if (deep && (loc = indexOf(seen, obj)) >= 0) {
-        return copies[loc];
-      }
+      if (deep && (loc=indexOf(seen, obj))>=0) return copies[loc];
 
       
       // IMPORTANT: this specific test will detect a native array only. Any other
       // object will need to implement Copyable.
       if (typeOf(obj) === 'array') {
         ret = obj.slice();
-
         if (deep) {
           loc = ret.length;
-
-          while (--loc >= 0) {
-            ret[loc] = _copy(ret[loc], deep, seen, copies);
-          }
+          while(--loc>=0) ret[loc] = _copy(ret[loc], deep, seen, copies);
         }
       } else if (Copyable && Copyable.detect(obj)) {
         ret = obj.copy(deep, seen, copies);
@@ -28610,18 +27232,12 @@ enifed("ember-runtime/copy",
         ret = new Date(obj.getTime());
       } else {
         ret = {};
-
-        for (key in obj) {
-          // support Null prototype
-          if (!Object.prototype.hasOwnProperty.call(obj, key)) {
-            continue;
-          }
+        for(key in obj) {
+          if (!obj.hasOwnProperty(key)) continue;
 
           // Prevents browsers that don't respect non-enumerability from
           // copying internal Ember properties
-          if (key.substring(0, 2) === '__') {
-            continue;
-          }
+          if (key.substring(0,2) === '__') continue;
 
           ret[key] = deep ? _copy(obj[key], deep, seen, copies) : obj[key];
         }
@@ -28651,18 +27267,12 @@ enifed("ember-runtime/copy",
     */
     __exports__["default"] = function copy(obj, deep) {
       // fast paths
-      if ('object' !== typeof obj || obj === null) {
-        return obj; // can't copy primitives
-      }
-
-      if (Copyable && Copyable.detect(obj)) {
-        return obj.copy(deep);
-      }
-
+      if ('object' !== typeof obj || obj === null) return obj; // can't copy primitives
+      if (Copyable && Copyable.detect(obj)) return obj.copy(deep);
       return _copy(obj, deep, deep ? [] : null, deep ? [] : null);
     }
   });
-enifed("ember-runtime/core",
+define("ember-runtime/core",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -28690,21 +27300,17 @@ enifed("ember-runtime/core",
       @return {Boolean}
     */
     var isEqual = function isEqual(a, b) {
-      if (a && typeof a.isEqual === 'function') {
-        return a.isEqual(b);
-      }
-
+      if (a && 'function'===typeof a.isEqual) return a.isEqual(b);
       if (a instanceof Date && b instanceof Date) {
         return a.getTime() === b.getTime();
       }
-
       return a === b;
     };
     __exports__.isEqual = isEqual;
   });
-enifed("ember-runtime/ext/function",
-  ["ember-metal/core","ember-metal/expand_properties","ember-metal/computed","ember-metal/mixin"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
+define("ember-runtime/ext/function",
+  ["ember-metal/core","ember-metal/expand_properties","ember-metal/computed"],
+  function(__dependency1__, __dependency2__, __dependency3__) {
     "use strict";
     /**
     @module ember
@@ -28715,7 +27321,6 @@ enifed("ember-runtime/ext/function",
     // Ember.EXTEND_PROTOTYPES, Ember.assert
     var expandProperties = __dependency2__["default"];
     var computed = __dependency3__.computed;
-    var observer = __dependency4__.observer;
 
     var a_slice = Array.prototype.slice;
     var FunctionPrototype = Function.prototype;
@@ -28736,15 +27341,17 @@ enifed("ember-runtime/ext/function",
 
           fullName: function() {
             return this.get('firstName') + ' ' + this.get('lastName');
-          }.property() // Call this flag to mark the function as a property
+
+            // Call this flag to mark the function as a property
+          }.property()
         });
 
         var president = MyApp.President.create({
-          firstName: 'Barack',
-          lastName: 'Obama'
+          firstName: "Barack",
+          lastName: "Obama"
         });
 
-        president.get('fullName'); // 'Barack Obama'
+        president.get('fullName');    // "Barack Obama"
         ```
 
         Treating a function like a property is useful because they can work with
@@ -28780,7 +27387,7 @@ enifed("ember-runtime/ext/function",
         @method property
         @for Function
       */
-      FunctionPrototype.property = function () {
+      FunctionPrototype.property = function() {
         var ret = computed(this);
         // ComputedProperty.prototype.property expands properties; no need for us to
         // do so here.
@@ -28813,12 +27420,16 @@ enifed("ember-runtime/ext/function",
         @for Function
       */
       FunctionPrototype.observes = function() {
-        var length = arguments.length;
-        var args = new Array(length);
-        for (var x = 0; x < length; x++) {
-          args[x] = arguments[x];
+        var addWatchedProperty = function (obs) { watched.push(obs); };
+        var watched = [];
+
+        for (var i=0; i<arguments.length; ++i) {
+          expandProperties(arguments[i], addWatchedProperty);
         }
-        return observer.apply(this, args.concat(this));
+
+        this.__ember_observes__ = watched;
+
+        return this;
       };
 
       /**
@@ -28846,8 +27457,8 @@ enifed("ember-runtime/ext/function",
         @method observesImmediately
         @for Function
       */
-      FunctionPrototype.observesImmediately = function () {
-        for (var i = 0, l = arguments.length; i < l; i++) {
+      FunctionPrototype.observesImmediately = function() {
+        for (var i=0, l=arguments.length; i<l; i++) {
           var arg = arguments[i];
                   }
 
@@ -28877,13 +27488,11 @@ enifed("ember-runtime/ext/function",
         @method observesBefore
         @for Function
       */
-      FunctionPrototype.observesBefore = function () {
+      FunctionPrototype.observesBefore = function() {
+        var addWatchedProperty = function (obs) { watched.push(obs); };
         var watched = [];
-        var addWatchedProperty = function (obs) {
-          watched.push(obs);
-        };
 
-        for (var i = 0, l = arguments.length; i < l; ++i) {
+        for (var i=0; i<arguments.length; ++i) {
           expandProperties(arguments[i], addWatchedProperty);
         }
 
@@ -28913,56 +27522,26 @@ enifed("ember-runtime/ext/function",
         @method on
         @for Function
       */
-      FunctionPrototype.on = function () {
+      FunctionPrototype.on = function() {
         var events = a_slice.call(arguments);
         this.__ember_listens__ = events;
-
         return this;
       };
     }
   });
-enifed("ember-runtime/ext/rsvp",
-  ["ember-metal/core","ember-metal/logger","ember-metal/run_loop","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+define("ember-runtime/ext/rsvp",
+  ["ember-metal/core","ember-metal/logger","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     /* globals RSVP:true */
 
     var Ember = __dependency1__["default"];
     var Logger = __dependency2__["default"];
-    var run = __dependency3__["default"];
 
-    var RSVP = requireModule('rsvp');
-    var testModuleName = 'ember-testing/test';
-    var Test;
+    var RSVP = requireModule("rsvp");
+    var Test, testModuleName = 'ember-testing/test';
 
-    var asyncStart = function() {
-      if (Ember.Test && Ember.Test.adapter) {
-        Ember.Test.adapter.asyncStart();
-      }
-    };
-
-    var asyncEnd = function() {
-      if (Ember.Test && Ember.Test.adapter) {
-        Ember.Test.adapter.asyncEnd();
-      }
-    };
-
-    RSVP.configure('async', function(callback, promise) {
-      var async = !run.currentRunLoop;
-
-      if (Ember.testing && async) { asyncStart(); }
-
-      run.backburner.schedule('actions', function(){
-        if (Ember.testing && async) { asyncEnd(); }
-        callback(promise);
-      });
-    });
-
-    RSVP.Promise.prototype.fail = function(callback, label){
-            return this['catch'](callback, label);
-    };
-
-    RSVP.onerrorDefault = function (error) {
+    RSVP.onerrorDefault = function(error) {
       if (error instanceof Error) {
         if (Ember.testing) {
           // ES6TODO: remove when possible
@@ -28987,7 +27566,7 @@ enifed("ember-runtime/ext/rsvp",
 
     __exports__["default"] = RSVP;
   });
-enifed("ember-runtime/ext/string",
+define("ember-runtime/ext/string",
   ["ember-metal/core","ember-runtime/system/string"],
   function(__dependency1__, __dependency2__) {
     "use strict";
@@ -29018,7 +27597,7 @@ enifed("ember-runtime/ext/string",
         @method fmt
         @for String
       */
-      StringPrototype.fmt = function () {
+      StringPrototype.fmt = function() {
         return fmt(this, arguments);
       };
 
@@ -29028,7 +27607,7 @@ enifed("ember-runtime/ext/string",
         @method w
         @for String
       */
-      StringPrototype.w = function () {
+      StringPrototype.w = function() {
         return w(this);
       };
 
@@ -29038,7 +27617,7 @@ enifed("ember-runtime/ext/string",
         @method loc
         @for String
       */
-      StringPrototype.loc = function () {
+      StringPrototype.loc = function() {
         return loc(this, arguments);
       };
 
@@ -29048,7 +27627,7 @@ enifed("ember-runtime/ext/string",
         @method camelize
         @for String
       */
-      StringPrototype.camelize = function () {
+      StringPrototype.camelize = function() {
         return camelize(this);
       };
 
@@ -29058,7 +27637,7 @@ enifed("ember-runtime/ext/string",
         @method decamelize
         @for String
       */
-      StringPrototype.decamelize = function () {
+      StringPrototype.decamelize = function() {
         return decamelize(this);
       };
 
@@ -29068,7 +27647,7 @@ enifed("ember-runtime/ext/string",
         @method dasherize
         @for String
       */
-      StringPrototype.dasherize = function () {
+      StringPrototype.dasherize = function() {
         return dasherize(this);
       };
 
@@ -29078,7 +27657,7 @@ enifed("ember-runtime/ext/string",
         @method underscore
         @for String
       */
-      StringPrototype.underscore = function () {
+      StringPrototype.underscore = function() {
         return underscore(this);
       };
 
@@ -29088,7 +27667,7 @@ enifed("ember-runtime/ext/string",
         @method classify
         @for String
       */
-      StringPrototype.classify = function () {
+      StringPrototype.classify = function() {
         return classify(this);
       };
 
@@ -29098,108 +27677,70 @@ enifed("ember-runtime/ext/string",
         @method capitalize
         @for String
       */
-      StringPrototype.capitalize = function () {
+      StringPrototype.capitalize = function() {
         return capitalize(this);
       };
     }
   });
-enifed("ember-runtime/mixins/-proxy",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/observer","ember-metal/property_events","ember-metal/computed","ember-metal/properties","ember-metal/mixin","ember-runtime/system/string","ember-runtime/system/object","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+define("ember-runtime/keys",
+  ["ember-metal/enumerable_utils","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    /**
-    @module ember
-    @submodule ember-runtime
-    */
-
-    var Ember = __dependency1__["default"];
-    // Ember.assert
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var meta = __dependency4__.meta;
-    var addObserver = __dependency5__.addObserver;
-    var removeObserver = __dependency5__.removeObserver;
-    var addBeforeObserver = __dependency5__.addBeforeObserver;
-    var removeBeforeObserver = __dependency5__.removeBeforeObserver;
-    var propertyWillChange = __dependency6__.propertyWillChange;
-    var propertyDidChange = __dependency6__.propertyDidChange;
-    var computed = __dependency7__.computed;
-    var defineProperty = __dependency8__.defineProperty;
-    var Mixin = __dependency9__.Mixin;
-    var observer = __dependency9__.observer;
-    var fmt = __dependency10__.fmt;
-    var EmberObject = __dependency11__["default"];
-
-    function contentPropertyWillChange(content, contentKey) {
-      var key = contentKey.slice(8); // remove "content."
-      if (key in this) { return; }  // if shadowed in proxy
-      propertyWillChange(this, key);
-    }
-
-    function contentPropertyDidChange(content, contentKey) {
-      var key = contentKey.slice(8); // remove "content."
-      if (key in this) { return; } // if shadowed in proxy
-      propertyDidChange(this, key);
-    }
+    var EnumerableUtils = __dependency1__["default"];
+    var create = __dependency2__.create;
 
     /**
-      `Ember.ProxyMixin` forwards all properties not defined by the proxy itself
-      to a proxied `content` object.  See Ember.ObjectProxy for more details.
+      Returns all of the keys defined on an object or hash. This is useful
+      when inspecting objects for debugging. On browsers that support it, this
+      uses the native `Object.keys` implementation.
 
-      @class ProxyMixin
-      @namespace Ember
+      @method keys
+      @for Ember
+      @param {Object} obj
+      @return {Array} Array containing keys of obj
     */
-    __exports__["default"] = Mixin.create({
-      /**
-        The object whose properties will be forwarded.
+    var keys = Object.keys;
+    if (!keys || create.isSimulated) {
+      var prototypeProperties = [
+        'constructor',
+        'hasOwnProperty',
+        'isPrototypeOf',
+        'propertyIsEnumerable',
+        'valueOf',
+        'toLocaleString',
+        'toString'
+      ],
+      pushPropertyName = function(obj, array, key) {
+        // Prevents browsers that don't respect non-enumerability from
+        // copying internal Ember properties
+        if (key.substring(0,2) === '__') return;
+        if (key === '_super') return;
+        if (EnumerableUtils.indexOf(array, key) >= 0) return;
+        if (!Object.prototype.hasOwnProperty.call(obj, key)) return;
 
-        @property content
-        @type Ember.Object
-        @default null
-      */
-      content: null,
-      _contentDidChange: observer('content', function() {
-              }),
+        array.push(key);
+      };
 
-      isTruthy: computed.bool('content'),
-
-      _debugContainerKey: null,
-
-      willWatchProperty: function (key) {
-        var contentKey = 'content.' + key;
-        addBeforeObserver(this, contentKey, null, contentPropertyWillChange);
-        addObserver(this, contentKey, null, contentPropertyDidChange);
-      },
-
-      didUnwatchProperty: function (key) {
-        var contentKey = 'content.' + key;
-        removeBeforeObserver(this, contentKey, null, contentPropertyWillChange);
-        removeObserver(this, contentKey, null, contentPropertyDidChange);
-      },
-
-      unknownProperty: function (key) {
-        var content = get(this, 'content');
-        if (content) {
-          return get(content, key);
-        }
-      },
-
-      setUnknownProperty: function (key, value) {
-        var m = meta(this);
-        if (m.proto === this) {
-          // if marked as prototype then just defineProperty
-          // rather than delegate
-          defineProperty(this, key, null, value);
-          return value;
+      keys = function keys(obj) {
+        var ret = [], key;
+        for (key in obj) {
+          pushPropertyName(obj, ret, key);
         }
 
-        var content = get(this, 'content');
-                return set(content, key, value);
-      }
+        // IE8 doesn't enumerate property that named the same as prototype properties.
+        for (var i = 0, l = prototypeProperties.length; i < l; i++) {
+          key = prototypeProperties[i];
 
-    });
+          pushPropertyName(obj, ret, key);
+        }
+
+        return ret;
+      };
+    }
+
+    __exports__["default"] = keys;
   });
-enifed("ember-runtime/mixins/action_handler",
+define("ember-runtime/mixins/action_handler",
   ["ember-metal/merge","ember-metal/mixin","ember-metal/property_get","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -29407,8 +27948,7 @@ enifed("ember-runtime/mixins/action_handler",
         @param {*} context a context to send with the action
       */
       send: function(actionName) {
-        var args = [].slice.call(arguments, 1);
-        var target;
+        var args = [].slice.call(arguments, 1), target;
 
         if (this._actions && this._actions[actionName]) {
           if (this._actions[actionName].apply(this, args) === true) {
@@ -29416,6 +27956,12 @@ enifed("ember-runtime/mixins/action_handler",
           } else {
             return;
           }
+        } else if (!Ember.FEATURES.isEnabled('ember-routing-drop-deprecated-action-style') && this.deprecatedSend && this.deprecatedSendHandles && this.deprecatedSendHandles(actionName)) {
+                    if (this.deprecatedSend.apply(this, [].slice.call(arguments)) === true) {
+            // handler return true, so this action will bubble
+          } else {
+            return;
+          }
         }
 
         if (target = get(this, 'target')) {
@@ -29426,9 +27972,9 @@ enifed("ember-runtime/mixins/action_handler",
 
     __exports__["default"] = ActionHandler;
   });
-enifed("ember-runtime/mixins/array",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/computed","ember-metal/is_none","ember-runtime/mixins/enumerable","ember-metal/enumerable_utils","ember-metal/mixin","ember-metal/property_events","ember-metal/events","ember-metal/watching","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+define("ember-runtime/mixins/array",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/is_none","ember-runtime/mixins/enumerable","ember-metal/enumerable_utils","ember-metal/mixin","ember-metal/property_events","ember-metal/events","ember-metal/watching","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -29440,41 +27986,24 @@ enifed("ember-runtime/mixins/array",
     //
     var Ember = __dependency1__["default"];
     // ES6TODO: Ember.A
+
     var get = __dependency2__.get;
-    var computed = __dependency3__.computed;
-    var cacheFor = __dependency3__.cacheFor;
-    var isNone = __dependency4__.isNone;
-    var none = __dependency4__.none;
-    var Enumerable = __dependency5__["default"];
-    var map = __dependency6__.map;
-    var Mixin = __dependency7__.Mixin;
-    var required = __dependency7__.required;
-    var propertyWillChange = __dependency8__.propertyWillChange;
-    var propertyDidChange = __dependency8__.propertyDidChange;
-    var addListener = __dependency9__.addListener;
-    var removeListener = __dependency9__.removeListener;
-    var sendEvent = __dependency9__.sendEvent;
-    var hasListeners = __dependency9__.hasListeners;
-    var isWatching = __dependency10__.isWatching;
-
-    function arrayObserversHelper(obj, target, opts, operation, notify) {
-      var willChange = (opts && opts.willChange) || 'arrayWillChange';
-      var didChange  = (opts && opts.didChange) || 'arrayDidChange';
-      var hasObservers = get(obj, 'hasArrayObservers');
-
-      if (hasObservers === notify) {
-        propertyWillChange(obj, 'hasArrayObservers');
-      }
-
-      operation(obj, '@array:before', target, willChange);
-      operation(obj, '@array:change', target, didChange);
-
-      if (hasObservers === notify) {
-        propertyDidChange(obj, 'hasArrayObservers');
-      }
-
-      return obj;
-    }
+    var set = __dependency3__.set;
+    var computed = __dependency4__.computed;
+    var cacheFor = __dependency4__.cacheFor;
+    var isNone = __dependency5__.isNone;
+    var none = __dependency5__.none;
+    var Enumerable = __dependency6__["default"];
+    var map = __dependency7__.map;
+    var Mixin = __dependency8__.Mixin;
+    var required = __dependency8__.required;
+    var propertyWillChange = __dependency9__.propertyWillChange;
+    var propertyDidChange = __dependency9__.propertyDidChange;
+    var addListener = __dependency10__.addListener;
+    var removeListener = __dependency10__.removeListener;
+    var sendEvent = __dependency10__.sendEvent;
+    var hasListeners = __dependency10__.hasListeners;
+    var isWatching = __dependency11__.isWatching;
 
     // ..........................................................
     // ARRAY
@@ -29536,9 +28065,8 @@ enifed("ember-runtime/mixins/array",
 
         ```javascript
         var arr = ['a', 'b', 'c', 'd'];
-
-        arr.objectAt(0);   // 'a'
-        arr.objectAt(3);   // 'd'
+        arr.objectAt(0);   // "a"
+        arr.objectAt(3);   // "d"
         arr.objectAt(-1);  // undefined
         arr.objectAt(4);   // undefined
         arr.objectAt(5);   // undefined
@@ -29549,10 +28077,7 @@ enifed("ember-runtime/mixins/array",
         @return {*} item at index or undefined
       */
       objectAt: function(idx) {
-        if (idx < 0 || idx >= get(this, 'length')) {
-          return undefined;
-        }
-
+        if ((idx < 0) || (idx >= get(this, 'length'))) return undefined;
         return get(this, idx);
       },
 
@@ -29561,9 +28086,8 @@ enifed("ember-runtime/mixins/array",
 
         ```javascript
         var arr = ['a', 'b', 'c', 'd'];
-
-        arr.objectsAt([0, 1, 2]);  // ['a', 'b', 'c']
-        arr.objectsAt([2, 3, 4]);  // ['c', 'd', undefined]
+        arr.objectsAt([0, 1, 2]);  // ["a", "b", "c"]
+        arr.objectsAt([2, 3, 4]);  // ["c", "d", undefined]
         ```
 
         @method objectsAt
@@ -29572,10 +28096,7 @@ enifed("ember-runtime/mixins/array",
        */
       objectsAt: function(indexes) {
         var self = this;
-
-        return map(indexes, function(idx) {
-          return self.objectAt(idx);
-        });
+        return map(indexes, function(idx) { return self.objectAt(idx); });
       },
 
       // overrides Ember.Enumerable version
@@ -29594,11 +28115,8 @@ enifed("ember-runtime/mixins/array",
         @return this
       */
       '[]': computed(function(key, value) {
-        if (value !== undefined) {
-          this.replace(0, get(this, 'length'), value);
-        }
-
-        return this;
+        if (value !== undefined) this.replace(0, get(this, 'length'), value) ;
+        return this ;
       }),
 
       firstObject: computed(function() {
@@ -29606,7 +28124,7 @@ enifed("ember-runtime/mixins/array",
       }),
 
       lastObject: computed(function() {
-        return this.objectAt(get(this, 'length') - 1);
+        return this.objectAt(get(this, 'length')-1);
       }),
 
       // optimized version from Enumerable
@@ -29622,7 +28140,6 @@ enifed("ember-runtime/mixins/array",
 
         ```javascript
         var arr = ['red', 'green', 'blue'];
-
         arr.slice(0);       // ['red', 'green', 'blue']
         arr.slice(0, 2);    // ['red', 'green']
         arr.slice(1, 100);  // ['green', 'blue']
@@ -29635,29 +28152,17 @@ enifed("ember-runtime/mixins/array",
       */
       slice: function(beginIndex, endIndex) {
         var ret = Ember.A();
-        var length = get(this, 'length');
+        var length = get(this, 'length') ;
+        if (isNone(beginIndex)) beginIndex = 0 ;
+        if (isNone(endIndex) || (endIndex > length)) endIndex = length ;
 
-        if (isNone(beginIndex)) {
-          beginIndex = 0;
+        if (beginIndex < 0) beginIndex = length + beginIndex;
+        if (endIndex < 0) endIndex = length + endIndex;
+
+        while(beginIndex < endIndex) {
+          ret[ret.length] = this.objectAt(beginIndex++) ;
         }
-
-        if (isNone(endIndex) || (endIndex > length)) {
-          endIndex = length;
-        }
-
-        if (beginIndex < 0) {
-          beginIndex = length + beginIndex;
-        }
-
-        if (endIndex < 0) {
-          endIndex = length + endIndex;
-        }
-
-        while (beginIndex < endIndex) {
-          ret[ret.length] = this.objectAt(beginIndex++);
-        }
-
-        return ret;
+        return ret ;
       },
 
       /**
@@ -29667,14 +28172,13 @@ enifed("ember-runtime/mixins/array",
         the end of the array. Returns -1 if no match is found.
 
         ```javascript
-        var arr = ['a', 'b', 'c', 'd', 'a'];
-
-        arr.indexOf('a');       //  0
-        arr.indexOf('z');       // -1
-        arr.indexOf('a', 2);    //  4
-        arr.indexOf('a', -1);   //  4
-        arr.indexOf('b', 3);    // -1
-        arr.indexOf('a', 100);  // -1
+        var arr = ["a", "b", "c", "d", "a"];
+        arr.indexOf("a");       //  0
+        arr.indexOf("z");       // -1
+        arr.indexOf("a", 2);    //  4
+        arr.indexOf("a", -1);   //  4
+        arr.indexOf("b", 3);    // -1
+        arr.indexOf("a", 100);  // -1
         ```
 
         @method indexOf
@@ -29683,23 +28187,14 @@ enifed("ember-runtime/mixins/array",
         @return {Number} index or -1 if not found
       */
       indexOf: function(object, startAt) {
-        var len = get(this, 'length');
-        var idx;
+        var idx, len = get(this, 'length');
 
-        if (startAt === undefined) {
-          startAt = 0;
+        if (startAt === undefined) startAt = 0;
+        if (startAt < 0) startAt += len;
+
+        for(idx = startAt; idx < len; idx++) {
+          if (this.objectAt(idx) === object) return idx;
         }
-
-        if (startAt < 0) {
-          startAt += len;
-        }
-
-        for (idx = startAt; idx < len; idx++) {
-          if (this.objectAt(idx) === object) {
-            return idx;
-          }
-        }
-
         return -1;
       },
 
@@ -29710,14 +28205,13 @@ enifed("ember-runtime/mixins/array",
         from the end of the array. Returns -1 if no match is found.
 
         ```javascript
-        var arr = ['a', 'b', 'c', 'd', 'a'];
-
-        arr.lastIndexOf('a');       //  4
-        arr.lastIndexOf('z');       // -1
-        arr.lastIndexOf('a', 2);    //  0
-        arr.lastIndexOf('a', -1);   //  4
-        arr.lastIndexOf('b', 3);    //  1
-        arr.lastIndexOf('a', 100);  //  4
+        var arr = ["a", "b", "c", "d", "a"];
+        arr.lastIndexOf("a");       //  4
+        arr.lastIndexOf("z");       // -1
+        arr.lastIndexOf("a", 2);    //  0
+        arr.lastIndexOf("a", -1);   //  4
+        arr.lastIndexOf("b", 3);    //  1
+        arr.lastIndexOf("a", 100);  //  4
         ```
 
         @method lastIndexOf
@@ -29726,23 +28220,14 @@ enifed("ember-runtime/mixins/array",
         @return {Number} index or -1 if not found
       */
       lastIndexOf: function(object, startAt) {
-        var len = get(this, 'length');
-        var idx;
+        var idx, len = get(this, 'length');
 
-        if (startAt === undefined || startAt >= len) {
-          startAt = len-1;
+        if (startAt === undefined || startAt >= len) startAt = len-1;
+        if (startAt < 0) startAt += len;
+
+        for(idx = startAt; idx >= 0; idx--) {
+          if (this.objectAt(idx) === object) return idx;
         }
-
-        if (startAt < 0) {
-          startAt += len;
-        }
-
-        for (idx = startAt; idx >= 0; idx--) {
-          if (this.objectAt(idx) === object) {
-            return idx;
-          }
-        }
-
         return -1;
       },
 
@@ -29774,9 +28259,16 @@ enifed("ember-runtime/mixins/array",
           `willChange` and `didChange` option.
         @return {Ember.Array} receiver
       */
-
       addArrayObserver: function(target, opts) {
-        return arrayObserversHelper(this, target, opts, addListener, false);
+        var willChange = (opts && opts.willChange) || 'arrayWillChange',
+            didChange  = (opts && opts.didChange) || 'arrayDidChange';
+
+        var hasObservers = get(this, 'hasArrayObservers');
+        if (!hasObservers) propertyWillChange(this, 'hasArrayObservers');
+        addListener(this, '@array:before', target, willChange);
+        addListener(this, '@array:change', target, didChange);
+        if (!hasObservers) propertyDidChange(this, 'hasArrayObservers');
+        return this;
       },
 
       /**
@@ -29791,7 +28283,15 @@ enifed("ember-runtime/mixins/array",
         @return {Ember.Array} receiver
       */
       removeArrayObserver: function(target, opts) {
-        return arrayObserversHelper(this, target, opts, removeListener, true);
+        var willChange = (opts && opts.willChange) || 'arrayWillChange',
+            didChange  = (opts && opts.didChange) || 'arrayDidChange';
+
+        var hasObservers = get(this, 'hasArrayObservers');
+        if (hasObservers) propertyWillChange(this, 'hasArrayObservers');
+        removeListener(this, '@array:before', target, willChange);
+        removeListener(this, '@array:change', target, didChange);
+        if (hasObservers) propertyDidChange(this, 'hasArrayObservers');
+        return this;
       },
 
       /**
@@ -29819,36 +28319,26 @@ enifed("ember-runtime/mixins/array",
         @return {Ember.Array} receiver
       */
       arrayContentWillChange: function(startIdx, removeAmt, addAmt) {
-        var removing, lim;
 
         // if no args are passed assume everything changes
-        if (startIdx === undefined) {
+        if (startIdx===undefined) {
           startIdx = 0;
           removeAmt = addAmt = -1;
         } else {
-          if (removeAmt === undefined) {
-            removeAmt = -1;
-          }
-
-          if (addAmt === undefined) {
-            addAmt = -1;
-          }
+          if (removeAmt === undefined) removeAmt=-1;
+          if (addAmt    === undefined) addAmt=-1;
         }
 
         // Make sure the @each proxy is set up if anyone is observing @each
-        if (isWatching(this, '@each')) {
-          get(this, '@each');
-        }
+        if (isWatching(this, '@each')) { get(this, '@each'); }
 
         sendEvent(this, '@array:before', [this, startIdx, removeAmt, addAmt]);
 
-        if (startIdx >= 0 && removeAmt >= 0 && get(this, 'hasEnumerableObservers')) {
+        var removing, lim;
+        if (startIdx>=0 && removeAmt>=0 && get(this, 'hasEnumerableObservers')) {
           removing = [];
-          lim = startIdx + removeAmt;
-
-          for (var idx = startIdx; idx < lim; idx++) {
-            removing.push(this.objectAt(idx));
-          }
+          lim = startIdx+removeAmt;
+          for(var idx=startIdx;idx<lim;idx++) removing.push(this.objectAt(idx));
         } else {
           removing = removeAmt;
         }
@@ -29873,29 +28363,21 @@ enifed("ember-runtime/mixins/array",
         @return {Ember.Array} receiver
       */
       arrayContentDidChange: function(startIdx, removeAmt, addAmt) {
-        var adding, lim;
 
         // if no args are passed assume everything changes
-        if (startIdx === undefined) {
+        if (startIdx===undefined) {
           startIdx = 0;
           removeAmt = addAmt = -1;
         } else {
-          if (removeAmt === undefined) {
-            removeAmt = -1;
-          }
-
-          if (addAmt === undefined) {
-            addAmt = -1;
-          }
+          if (removeAmt === undefined) removeAmt=-1;
+          if (addAmt    === undefined) addAmt=-1;
         }
 
-        if (startIdx >= 0 && addAmt >= 0 && get(this, 'hasEnumerableObservers')) {
+        var adding, lim;
+        if (startIdx>=0 && addAmt>=0 && get(this, 'hasEnumerableObservers')) {
           adding = [];
-          lim = startIdx + addAmt;
-
-          for (var idx = startIdx; idx < lim; idx++) {
-            adding.push(this.objectAt(idx));
-          }
+          lim = startIdx+addAmt;
+          for(var idx=startIdx;idx<lim;idx++) adding.push(this.objectAt(idx));
         } else {
           adding = addAmt;
         }
@@ -29903,15 +28385,13 @@ enifed("ember-runtime/mixins/array",
         this.enumerableContentDidChange(removeAmt, adding);
         sendEvent(this, '@array:change', [this, startIdx, removeAmt, addAmt]);
 
-        var length = get(this, 'length');
-        var cachedFirst = cacheFor(this, 'firstObject');
-        var cachedLast = cacheFor(this, 'lastObject');
-
+        var length      = get(this, 'length'),
+            cachedFirst = cacheFor(this, 'firstObject'),
+            cachedLast  = cacheFor(this, 'lastObject');
         if (this.objectAt(0) !== cachedFirst) {
           propertyWillChange(this, 'firstObject');
           propertyDidChange(this, 'firstObject');
         }
-
         if (this.objectAt(length-1) !== cachedLast) {
           propertyWillChange(this, 'lastObject');
           propertyDidChange(this, 'lastObject');
@@ -29947,7 +28427,7 @@ enifed("ember-runtime/mixins/array",
       })
     });
   });
-enifed("ember-runtime/mixins/comparable",
+define("ember-runtime/mixins/comparable",
   ["ember-metal/mixin","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -29989,7 +28469,7 @@ enifed("ember-runtime/mixins/comparable",
       compare: required(Function)
     });
   });
-enifed("ember-runtime/mixins/controller",
+define("ember-runtime/mixins/controller",
   ["ember-metal/core","ember-metal/property_get","ember-runtime/system/object","ember-metal/mixin","ember-metal/computed","ember-runtime/mixins/action_handler","ember-runtime/mixins/controller_content_model_alias_deprecation","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
@@ -30053,11 +28533,20 @@ enifed("ember-runtime/mixins/controller",
       /**
         @private
        */
-      content: computed.alias('model')
+      content: computed.alias('model'),
 
+      deprecatedSendHandles: function(actionName) {
+        return !!this[actionName];
+      },
+
+      deprecatedSend: function(actionName) {
+        var args = [].slice.call(arguments, 1);
+                        this[actionName].apply(this, args);
+        return;
+      }
     });
   });
-enifed("ember-runtime/mixins/controller_content_model_alias_deprecation",
+define("ember-runtime/mixins/controller_content_model_alias_deprecation",
   ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -30115,7 +28604,7 @@ enifed("ember-runtime/mixins/controller_content_model_alias_deprecation",
       }
     });
   });
-enifed("ember-runtime/mixins/copyable",
+define("ember-runtime/mixins/copyable",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-runtime/mixins/freezable","ember-runtime/system/string","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -30183,16 +28672,44 @@ enifed("ember-runtime/mixins/copyable",
       }
     });
   });
-enifed("ember-runtime/mixins/deferred",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","ember-metal/computed","ember-runtime/ext/rsvp","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+define("ember-runtime/mixins/deferred",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","ember-metal/computed","ember-metal/run_loop","ember-runtime/ext/rsvp","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.FEATURES, Ember.Test
     var get = __dependency2__.get;
     var Mixin = __dependency3__.Mixin;
     var computed = __dependency4__.computed;
-    var RSVP = __dependency5__["default"];
+    var run = __dependency5__["default"];
+    var RSVP = __dependency6__["default"];
+
+    var asyncStart = function() {
+      if (Ember.Test && Ember.Test.adapter) {
+        Ember.Test.adapter.asyncStart();
+      }
+    };
+
+    var asyncEnd = function() {
+      if (Ember.Test && Ember.Test.adapter) {
+        Ember.Test.adapter.asyncEnd();
+      }
+    };
+
+    RSVP.configure('async', function(callback, promise) {
+      var async = !run.currentRunLoop;
+
+      if (Ember.testing && async) { asyncStart(); }
+
+      run.backburner.schedule('actions', function(){
+        if (Ember.testing && async) { asyncEnd(); }
+        callback(promise);
+      });
+    });
+
+    RSVP.Promise.prototype.fail = function(callback, label){
+            return this['catch'](callback, label);
+    };
 
     /**
     @module ember
@@ -30263,7 +28780,7 @@ enifed("ember-runtime/mixins/deferred",
       })
     });
   });
-enifed("ember-runtime/mixins/enumerable",
+define("ember-runtime/mixins/enumerable",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/property_events","ember-metal/events","ember-runtime/compare","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
@@ -30614,7 +29131,7 @@ enifed("ember-runtime/mixins/enumerable",
         - `index` is the current index in the iteration.
         - `enumerable` is the enumerable object itself.
 
-        It should return `true` to include the item in the results, `false`
+        It should return the `true` to include the item in the results, `false`
         otherwise.
 
         Note that in addition to a callback, you can also pass an optional target
@@ -30704,9 +29221,9 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Array} rejected array
       */
       rejectBy: function(key, value) {
-        var exactValue = function(item) { return get(item, key) === value; };
-        var hasValue = function(item) { return !!get(item, key); };
-        var use = (arguments.length === 2 ? exactValue : hasValue);
+        var exactValue = function(item) { return get(item, key) === value; },
+            hasValue = function(item) { return !!get(item, key); },
+            use = (arguments.length === 2 ? exactValue : hasValue);
 
         return this.reject(use);
       },
@@ -30903,11 +29420,11 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Boolean} `true` if the passed function returns `true` for any item
       */
       any: function(callback, target) {
-        var len     = get(this, 'length');
-        var context = popCtx();
-        var found   = false;
-        var last    = null;
-        var next, idx;
+        var len     = get(this, 'length'),
+            context = popCtx(),
+            found   = false,
+            last    = null,
+            next, idx;
 
         if (target === undefined) { target = null; }
 
@@ -31160,10 +29677,10 @@ enifed("ember-runtime/mixins/enumerable",
         @return this
       */
       addEnumerableObserver: function(target, opts) {
-        var willChange = (opts && opts.willChange) || 'enumerableWillChange';
-        var didChange  = (opts && opts.didChange) || 'enumerableDidChange';
-        var hasObservers = get(this, 'hasEnumerableObservers');
+        var willChange = (opts && opts.willChange) || 'enumerableWillChange',
+            didChange  = (opts && opts.didChange) || 'enumerableDidChange';
 
+        var hasObservers = get(this, 'hasEnumerableObservers');
         if (!hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
         addListener(this, '@enumerable:before', target, willChange);
         addListener(this, '@enumerable:change', target, didChange);
@@ -31180,8 +29697,8 @@ enifed("ember-runtime/mixins/enumerable",
         @return this
       */
       removeEnumerableObserver: function(target, opts) {
-        var willChange = (opts && opts.willChange) || 'enumerableWillChange';
-        var didChange  = (opts && opts.didChange) || 'enumerableDidChange';
+        var willChange = (opts && opts.willChange) || 'enumerableWillChange',
+            didChange  = (opts && opts.didChange) || 'enumerableDidChange';
 
         var hasObservers = get(this, 'hasEnumerableObservers');
         if (hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
@@ -31291,9 +29808,9 @@ enifed("ember-runtime/mixins/enumerable",
         var sortKeys = arguments;
         return this.toArray().sort(function(a, b){
           for(var i = 0; i < sortKeys.length; i++) {
-            var key = sortKeys[i];
-            var propA = get(a, key);
-            var propB = get(b, key);
+            var key = sortKeys[i],
+            propA = get(a, key),
+            propB = get(b, key);
             // return 1 or -1 else continue to the next sortKey
             var compareValue = compare(propA, propB);
             if (compareValue) { return compareValue; }
@@ -31303,7 +29820,7 @@ enifed("ember-runtime/mixins/enumerable",
       }
     });
   });
-enifed("ember-runtime/mixins/evented",
+define("ember-runtime/mixins/evented",
   ["ember-metal/mixin","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -31460,7 +29977,7 @@ enifed("ember-runtime/mixins/evented",
       }
     });
   });
-enifed("ember-runtime/mixins/freezable",
+define("ember-runtime/mixins/freezable",
   ["ember-metal/mixin","ember-metal/property_get","ember-metal/property_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -31558,7 +30075,7 @@ enifed("ember-runtime/mixins/freezable",
     var FROZEN_ERROR = "Frozen object cannot be modified.";
     __exports__.FROZEN_ERROR = FROZEN_ERROR;
   });
-enifed("ember-runtime/mixins/mutable_array",
+define("ember-runtime/mixins/mutable_array",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/mixin","ember-runtime/mixins/array","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/enumerable","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -31842,7 +30359,7 @@ enifed("ember-runtime/mixins/mutable_array",
       },
 
       /**
-        Replace all the receiver's content with content of the argument.
+        Replace all the the receiver's content with content of the argument.
         If argument is an empty array receiver will be cleared.
 
         ```javascript
@@ -31912,7 +30429,7 @@ enifed("ember-runtime/mixins/mutable_array",
 
     });
   });
-enifed("ember-runtime/mixins/mutable_enumerable",
+define("ember-runtime/mixins/mutable_enumerable",
   ["ember-metal/enumerable_utils","ember-runtime/mixins/enumerable","ember-metal/mixin","ember-metal/property_events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -32033,7 +30550,7 @@ enifed("ember-runtime/mixins/mutable_enumerable",
       }
     });
   });
-enifed("ember-runtime/mixins/observable",
+define("ember-runtime/mixins/observable",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/get_properties","ember-metal/set_properties","ember-metal/mixin","ember-metal/events","ember-metal/property_events","ember-metal/observer","ember-metal/computed","ember-metal/is_none","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
@@ -32175,7 +30692,7 @@ enifed("ember-runtime/mixins/observable",
       },
 
       /**
-        To get the values of multiple properties at once, call `getProperties`
+        To get multiple properties at once, call `getProperties`
         with a list of strings or an array:
 
         ```javascript
@@ -32541,12 +31058,12 @@ enifed("ember-runtime/mixins/observable",
       }
     });
   });
-enifed("ember-runtime/mixins/promise_proxy",
-  ["ember-metal/property_get","ember-metal/set_properties","ember-metal/computed","ember-metal/mixin","ember-metal/error","exports"],
+define("ember-runtime/mixins/promise_proxy",
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/mixin","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var get = __dependency1__.get;
-    var setProperties = __dependency2__["default"];
+    var set = __dependency2__.set;
     var computed = __dependency3__.computed;
     var Mixin = __dependency4__.Mixin;
     var EmberError = __dependency5__["default"];
@@ -32560,22 +31077,16 @@ enifed("ember-runtime/mixins/promise_proxy",
      */
 
     function tap(proxy, promise) {
-      setProperties(proxy, {
-        isFulfilled: false,
-        isRejected: false
-      });
+      set(proxy, 'isFulfilled', false);
+      set(proxy, 'isRejected', false);
 
       return promise.then(function(value) {
-        setProperties(proxy, {
-          content: value,
-          isFulfilled: true
-        });
+        set(proxy, 'isFulfilled', true);
+        set(proxy, 'content', value);
         return value;
       }, function(reason) {
-        setProperties(proxy, {
-          reason: reason,
-          isRejected: true
-        });
+        set(proxy, 'isRejected', true);
+        set(proxy, 'reason', reason);
         throw reason;
       }, "Ember: PromiseProxy");
     }
@@ -32755,7 +31266,7 @@ enifed("ember-runtime/mixins/promise_proxy",
       };
     }
   });
-enifed("ember-runtime/mixins/sortable",
+define("ember-runtime/mixins/sortable",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-runtime/mixins/mutable_enumerable","ember-runtime/compare","ember-metal/observer","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -32877,10 +31388,10 @@ enifed("ember-runtime/mixins/sortable",
       sortFunction: compare,
 
       orderBy: function(item1, item2) {
-        var result = 0;
-        var sortProperties = get(this, 'sortProperties');
-        var sortAscending = get(this, 'sortAscending');
-        var sortFunction = get(this, 'sortFunction');
+        var result = 0,
+            sortProperties = get(this, 'sortProperties'),
+            sortAscending = get(this, 'sortAscending'),
+            sortFunction = get(this, 'sortFunction');
 
         
         forEach(sortProperties, function(propertyName) {
@@ -32896,8 +31407,8 @@ enifed("ember-runtime/mixins/sortable",
       },
 
       destroy: function() {
-        var content = get(this, 'content');
-        var sortProperties = get(this, 'sortProperties');
+        var content = get(this, 'content'),
+            sortProperties = get(this, 'sortProperties');
 
         if (content && sortProperties) {
           forEach(content, function(item) {
@@ -32920,10 +31431,10 @@ enifed("ember-runtime/mixins/sortable",
       */
 
       arrangedContent: computed('content', 'sortProperties.@each', function(key, value) {
-        var content = get(this, 'content');
-        var isSorted = get(this, 'isSorted');
-        var sortProperties = get(this, 'sortProperties');
-        var self = this;
+        var content = get(this, 'content'),
+            isSorted = get(this, 'isSorted'),
+            sortProperties = get(this, 'sortProperties'),
+            self = this;
 
         if (content && isSorted) {
           content = content.slice();
@@ -32942,8 +31453,8 @@ enifed("ember-runtime/mixins/sortable",
       }),
 
       _contentWillChange: beforeObserver('content', function() {
-        var content = get(this, 'content');
-        var sortProperties = get(this, 'sortProperties');
+        var content = get(this, 'content'),
+            sortProperties = get(this, 'sortProperties');
 
         if (content && sortProperties) {
           forEach(content, function(item) {
@@ -32996,8 +31507,8 @@ enifed("ember-runtime/mixins/sortable",
       },
 
       contentArrayDidChange: function(array, idx, removedCount, addedCount) {
-        var isSorted = get(this, 'isSorted');
-        var sortProperties = get(this, 'sortProperties');
+        var isSorted = get(this, 'isSorted'),
+            sortProperties = get(this, 'sortProperties');
 
         if (isSorted) {
           var addedObjects = array.slice(idx, idx+addedCount);
@@ -33023,12 +31534,12 @@ enifed("ember-runtime/mixins/sortable",
       },
 
       contentItemSortPropertyDidChange: function(item) {
-        var arrangedContent = get(this, 'arrangedContent');
-        var oldIndex = arrangedContent.indexOf(item);
-        var leftItem = arrangedContent.objectAt(oldIndex - 1);
-        var rightItem = arrangedContent.objectAt(oldIndex + 1);
-        var leftResult = leftItem && this.orderBy(item, leftItem);
-        var rightResult = rightItem && this.orderBy(item, rightItem);
+        var arrangedContent = get(this, 'arrangedContent'),
+            oldIndex = arrangedContent.indexOf(item),
+            leftItem = arrangedContent.objectAt(oldIndex - 1),
+            rightItem = arrangedContent.objectAt(oldIndex + 1),
+            leftResult = leftItem && this.orderBy(item, leftItem),
+            rightResult = rightItem && this.orderBy(item, rightItem);
 
         if (leftResult < 0 || rightResult > 0) {
           arrangedContent.removeObject(item);
@@ -33060,7 +31571,7 @@ enifed("ember-runtime/mixins/sortable",
       }
     });
   });
-enifed("ember-runtime/mixins/target_action_support",
+define("ember-runtime/mixins/target_action_support",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/mixin","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -33174,9 +31685,9 @@ enifed("ember-runtime/mixins/target_action_support",
       */
       triggerAction: function(opts) {
         opts = opts || {};
-        var action = opts.action || get(this, 'action');
-        var target = opts.target || get(this, 'targetObject');
-        var actionContext = opts.actionContext;
+        var action = opts.action || get(this, 'action'),
+            target = opts.target || get(this, 'targetObject'),
+            actionContext = opts.actionContext;
 
         function args(options, actionName) {
           var ret = [];
@@ -33209,7 +31720,7 @@ enifed("ember-runtime/mixins/target_action_support",
 
     __exports__["default"] = TargetActionSupport;
   });
-enifed("ember-runtime/system/application",
+define("ember-runtime/system/application",
   ["ember-runtime/system/namespace","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -33217,7 +31728,7 @@ enifed("ember-runtime/system/application",
 
     __exports__["default"] = Namespace.extend();
   });
-enifed("ember-runtime/system/array_proxy",
+define("ember-runtime/system/array_proxy",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/property_events","ember-metal/error","ember-runtime/system/object","ember-runtime/mixins/mutable_array","ember-runtime/mixins/enumerable","ember-runtime/system/string","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
@@ -33361,28 +31872,7 @@ enifed("ember-runtime/system/array_proxy",
         }
       },
 
-      /**
-        Override to implement content array `willChange` observer.
-
-        @method contentArrayWillChange
-
-        @param {Ember.Array} contentArray the content array
-        @param {Number} start starting index of the change
-        @param {Number} removeCount count of items removed
-        @param {Number} addCount count of items added
-
-      */
       contentArrayWillChange: K,
-      /**
-        Override to implement content array `didChange` observer.
-
-        @method contentArrayDidChange
-
-        @param {Ember.Array} contentArray the content array
-        @param {Number} start starting index of the change
-        @param {Number} removeCount count of items removed
-        @param {Number} addCount count of items added
-      */
       contentArrayDidChange: K,
 
       /**
@@ -33412,8 +31902,8 @@ enifed("ember-runtime/system/array_proxy",
       },
 
       _arrangedContentWillChange: beforeObserver('arrangedContent', function() {
-        var arrangedContent = get(this, 'arrangedContent');
-        var len = arrangedContent ? get(arrangedContent, 'length') : 0;
+        var arrangedContent = get(this, 'arrangedContent'),
+            len = arrangedContent ? get(arrangedContent, 'length') : 0;
 
         this.arrangedContentArrayWillChange(this, 0, len, undefined);
         this.arrangedContentWillChange(this);
@@ -33422,8 +31912,8 @@ enifed("ember-runtime/system/array_proxy",
       }),
 
       _arrangedContentDidChange: observer('arrangedContent', function() {
-        var arrangedContent = get(this, 'arrangedContent');
-        var len = arrangedContent ? get(arrangedContent, 'length') : 0;
+        var arrangedContent = get(this, 'arrangedContent'),
+            len = arrangedContent ? get(arrangedContent, 'length') : 0;
 
         
         this._setupArrangedContent();
@@ -33498,10 +31988,9 @@ enifed("ember-runtime/system/array_proxy",
 
       removeAt: function(start, len) {
         if ('number' === typeof start) {
-          var content = get(this, 'content');
-          var arrangedContent = get(this, 'arrangedContent');
-          var indices = [];
-          var i;
+          var content = get(this, 'content'),
+              arrangedContent = get(this, 'arrangedContent'),
+              indices = [], i;
 
           if ((start < 0) || (start >= get(this, 'length'))) {
             throw new EmberError(OUT_OF_RANGE_EXCEPTION);
@@ -33586,7 +32075,7 @@ enifed("ember-runtime/system/array_proxy",
 
     __exports__["default"] = ArrayProxy;
   });
-enifed("ember-runtime/system/container",
+define("ember-runtime/system/container",
   ["ember-metal/property_set","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -33597,8 +32086,8 @@ enifed("ember-runtime/system/container",
 
     __exports__["default"] = Container;
   });
-enifed("ember-runtime/system/core_object",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/platform","ember-metal/watching","ember-metal/chains","ember-metal/events","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/error","ember-metal/keys","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/binding","ember-metal/computed","ember-metal/run_loop","exports"],
+define("ember-runtime/system/core_object",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/platform","ember-metal/watching","ember-metal/chains","ember-metal/events","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/error","ember-runtime/keys","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/binding","ember-metal/computed","ember-metal/run_loop","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
         // Remove "use strict"; from transpiled module until
     // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
@@ -33611,7 +32100,7 @@ enifed("ember-runtime/system/core_object",
     */
 
     var Ember = __dependency1__["default"];
-    // Ember.assert, Ember.K, Ember.config
+    // Ember.ENV.MANDATORY_SETTER, Ember.assert, Ember.K, Ember.config
 
     // NOTE: this object should never be included directly. Instead use `Ember.Object`.
     // We only define this separately so that `Ember.Set` can depend on it.
@@ -33623,6 +32112,7 @@ enifed("ember-runtime/system/core_object",
     var generateGuid = __dependency4__.generateGuid;
     var GUID_KEY = __dependency4__.GUID_KEY;
     var meta = __dependency4__.meta;
+    var META_KEY = __dependency4__.META_KEY;
     var makeArray = __dependency4__.makeArray;
     var rewatch = __dependency6__.rewatch;
     var finishChains = __dependency7__.finishChains;
@@ -33632,7 +32122,7 @@ enifed("ember-runtime/system/core_object",
     var required = __dependency9__.required;
     var indexOf = __dependency10__.indexOf;
     var EmberError = __dependency11__["default"];
-    var o_defineProperty = __dependency5__.defineProperty;
+    var platform = __dependency5__.platform;
     var keys = __dependency12__["default"];
     var ActionHandler = __dependency13__["default"];
     var defineProperty = __dependency14__.defineProperty;
@@ -33640,13 +32130,14 @@ enifed("ember-runtime/system/core_object",
     var ComputedProperty = __dependency16__.ComputedProperty;
     var run = __dependency17__["default"];
     var destroy = __dependency6__.destroy;
-    var K = __dependency1__.K;
-    var hasPropertyAccessors = __dependency5__.hasPropertyAccessors;
 
+    var K = __dependency1__.K;
+    var o_defineProperty = platform.defineProperty;
     var schedule = run.schedule;
     var applyMixin = Mixin._apply;
     var finishPartial = Mixin.finishPartial;
     var reopen = Mixin.prototype.reopen;
+    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
     var hasCachedComputedProperties = false;
 
     var undefinedDescriptor = {
@@ -33669,8 +32160,7 @@ enifed("ember-runtime/system/core_object",
       // method a lot faster. This is glue code so we want it to be as fast as
       // possible.
 
-      var wasApplied = false;
-      var initMixins, initProperties;
+      var wasApplied = false, initMixins, initProperties;
 
       var Class = function() {
         if (!wasApplied) {
@@ -33678,8 +32168,7 @@ enifed("ember-runtime/system/core_object",
         }
         o_defineProperty(this, GUID_KEY, nullDescriptor);
         o_defineProperty(this, '__nextSuper', undefinedDescriptor);
-        var m = meta(this);
-        var proto = m.proto;
+        var m = meta(this), proto = m.proto;
         m.proto = this;
         if (initMixins) {
           // capture locally so we can clear the closed over variable
@@ -33744,10 +32233,10 @@ enifed("ember-runtime/system/core_object",
               } else {
                 if (typeof this.setUnknownProperty === 'function' && !(keyName in this)) {
                   this.setUnknownProperty(keyName, value);
+                } else if (MANDATORY_SETTER) {
+                  defineProperty(this, keyName, null, value); // setup mandatory setter
                 } else {
-                  
-                    this[keyName] = value;
-                  
+                  this[keyName] = value;
                 }
               }
             }
@@ -33799,6 +32288,7 @@ enifed("ember-runtime/system/core_object",
     */
     var CoreObject = makeCtor();
     CoreObject.toString = function() { return "Ember.CoreObject"; };
+
     CoreObject.PrototypeMixin = Mixin.create({
       reopen: function() {
         var length = arguments.length;
@@ -34015,10 +32505,9 @@ enifed("ember-runtime/system/core_object",
         @return {String} string representation
       */
       toString: function toString() {
-        var hasToStringExtension = typeof this.toStringExtension === 'function';
-        var extension = hasToStringExtension ? ":" + this.toStringExtension() : '';
+        var hasToStringExtension = typeof this.toStringExtension === 'function',
+            extension = hasToStringExtension ? ":" + this.toStringExtension() : '';
         var ret = '<'+this.constructor.toString()+':'+guidFor(this)+extension+'>';
-
         this.toString = makeToString(ret);
         return ret;
       }
@@ -34126,9 +32615,8 @@ enifed("ember-runtime/system/core_object",
         @param {Mixin} [mixins]* One or more Mixin classes
         @param {Object} [arguments]* Object containing values to use within the new class
       */
-      extend: function extend() {
-        var Class = makeCtor();
-        var proto;
+      extend: function() {
+        var Class = makeCtor(), proto;
         Class.ClassMixin = Mixin.create(this.ClassMixin);
         Class.PrototypeMixin = Mixin.create(this.PrototypeMixin);
 
@@ -34374,8 +32862,8 @@ enifed("ember-runtime/system/core_object",
         @param key {String} property name
       */
       metaForProperty: function(key) {
-        var meta = this.proto()['__ember_meta__'];
-        var desc = meta && meta.descs[key];
+        var meta = this.proto()[META_KEY],
+            desc = meta && meta.descs[key];
 
                 return desc._meta || {};
       },
@@ -34442,12 +32930,15 @@ enifed("ember-runtime/system/core_object",
             cache._computedProperties = undefined;
           }
         }
+
+        this._super();
       }
     });
 
+
     __exports__["default"] = CoreObject;
   });
-enifed("ember-runtime/system/deferred",
+define("ember-runtime/system/deferred",
   ["ember-metal/core","ember-runtime/mixins/deferred","ember-metal/property_get","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -34472,7 +32963,7 @@ enifed("ember-runtime/system/deferred",
 
     __exports__["default"] = Deferred;
   });
-enifed("ember-runtime/system/each_proxy",
+define("ember-runtime/system/each_proxy",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/enumerable_utils","ember-metal/array","ember-runtime/mixins/array","ember-runtime/system/object","ember-metal/computed","ember-metal/observer","ember-metal/events","ember-metal/properties","ember-metal/property_events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
     "use strict";
@@ -34530,8 +33021,7 @@ enifed("ember-runtime/system/each_proxy",
     var IS_OBSERVER = /^.+:(before|change)$/;
 
     function addObserverForContentKey(content, keyName, proxy, idx, loc) {
-      var objects = proxy._objects;
-      var guid;
+      var objects = proxy._objects, guid;
       if (!objects) objects = proxy._objects = {};
 
       while(--loc>=idx) {
@@ -34612,8 +33102,7 @@ enifed("ember-runtime/system/each_proxy",
       // Invokes whenever the content array itself changes.
 
       arrayWillChange: function(content, idx, removedCnt, addedCnt) {
-        var keys = this._keys;
-        var key, lim;
+        var keys = this._keys, key, lim;
 
         lim = removedCnt>0 ? idx+removedCnt : -1;
         beginPropertyChanges(this);
@@ -34631,8 +33120,7 @@ enifed("ember-runtime/system/each_proxy",
       },
 
       arrayDidChange: function(content, idx, removedCnt, addedCnt) {
-        var keys = this._keys;
-        var lim;
+        var keys = this._keys, lim;
 
         lim = addedCnt>0 ? idx+addedCnt : -1;
         changeProperties(function() {
@@ -34673,9 +33161,8 @@ enifed("ember-runtime/system/each_proxy",
         if (!keys) keys = this._keys = {};
         if (!keys[keyName]) {
           keys[keyName] = 1;
-          var content = this._content;
-          var len = get(content, 'length');
-
+          var content = this._content,
+              len = get(content, 'length');
           addObserverForContentKey(content, keyName, this, 0, len);
         } else {
           keys[keyName]++;
@@ -34685,9 +33172,8 @@ enifed("ember-runtime/system/each_proxy",
       stopObservingContentKey: function(keyName) {
         var keys = this._keys;
         if (keys && (keys[keyName]>0) && (--keys[keyName]<=0)) {
-          var content = this._content;
-          var len     = get(content, 'length');
-
+          var content = this._content,
+              len     = get(content, 'length');
           removeObserverForContentKey(content, keyName, this, 0, len);
         }
       },
@@ -34704,7 +33190,7 @@ enifed("ember-runtime/system/each_proxy",
     __exports__.EachArray = EachArray;
     __exports__.EachProxy = EachProxy;
   });
-enifed("ember-runtime/system/lazy_load",
+define("ember-runtime/system/lazy_load",
   ["ember-metal/core","ember-metal/array","ember-runtime/system/native_array","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -34778,7 +33264,7 @@ enifed("ember-runtime/system/lazy_load",
 
     __exports__.runLoadHooks = runLoadHooks;
   });
-enifed("ember-runtime/system/namespace",
+define("ember-runtime/system/namespace",
   ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/utils","ember-metal/mixin","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -34823,7 +33309,7 @@ enifed("ember-runtime/system/namespace",
       },
 
       toString: function() {
-        var name = get(this, 'name') || get(this, 'modulePrefix');
+        var name = get(this, 'name');
         if (name) { return name; }
 
         findNamespaces();
@@ -34835,8 +33321,8 @@ enifed("ember-runtime/system/namespace",
       },
 
       destroy: function() {
-        var namespaces = Namespace.NAMESPACES;
-        var toString = this.toString();
+        var namespaces = Namespace.NAMESPACES,
+            toString = this.toString();
 
         if (toString) {
           Ember.lookup[toString] = undefined;
@@ -34915,8 +33401,7 @@ enifed("ember-runtime/system/namespace",
     }
 
     function findNamespaces() {
-      var lookup = Ember.lookup;
-      var obj, isNamespace;
+      var lookup = Ember.lookup, obj, isNamespace;
 
       if (Namespace.PROCESSED) { return; }
 
@@ -34973,8 +33458,8 @@ enifed("ember-runtime/system/namespace",
     }
 
     function processAllNamespaces() {
-      var unprocessedNamespaces = !Namespace.PROCESSED;
-      var unprocessedMixins = Ember.anyUnprocessedMixins;
+      var unprocessedNamespaces = !Namespace.PROCESSED,
+          unprocessedMixins = Ember.anyUnprocessedMixins;
 
       if (unprocessedNamespaces) {
         findNamespaces();
@@ -34982,9 +33467,7 @@ enifed("ember-runtime/system/namespace",
       }
 
       if (unprocessedNamespaces || unprocessedMixins) {
-        var namespaces = Namespace.NAMESPACES;
-        var namespace;
-
+        var namespaces = Namespace.NAMESPACES, namespace;
         for (var i=0, l=namespaces.length; i<l; i++) {
           namespace = namespaces[i];
           processNamespace([namespace.toString()], namespace, {});
@@ -35002,9 +33485,9 @@ enifed("ember-runtime/system/namespace",
 
     __exports__["default"] = Namespace;
   });
-enifed("ember-runtime/system/native_array",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-metal/array","ember-runtime/mixins/array","ember-runtime/mixins/mutable_array","ember-runtime/mixins/observable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-runtime/copy","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+define("ember-runtime/system/native_array",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-runtime/mixins/array","ember-runtime/mixins/mutable_array","ember-runtime/mixins/observable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-runtime/copy","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -35019,14 +33502,12 @@ enifed("ember-runtime/system/native_array",
     var replace = __dependency4__._replace;
     var forEach = __dependency4__.forEach;
     var Mixin = __dependency5__.Mixin;
-    var indexOf = __dependency6__.indexOf;
-    var lastIndexOf = __dependency6__.lastIndexOf;
-    var EmberArray = __dependency7__["default"];
-    var MutableArray = __dependency8__["default"];
-    var Observable = __dependency9__["default"];
-    var Copyable = __dependency10__["default"];
-    var FROZEN_ERROR = __dependency11__.FROZEN_ERROR;
-    var copy = __dependency12__["default"];
+    var EmberArray = __dependency6__["default"];
+    var MutableArray = __dependency7__["default"];
+    var Observable = __dependency8__["default"];
+    var Copyable = __dependency9__["default"];
+    var FROZEN_ERROR = __dependency10__.FROZEN_ERROR;
+    var copy = __dependency11__["default"];
 
     // Add Ember.Array to Array.prototype. Remove methods with native
     // implementations and supply some more optimized versions of generic methods
@@ -35084,15 +33565,39 @@ enifed("ember-runtime/system/native_array",
       // from member items.
       unknownProperty: function(key, value) {
         var ret;// = this.reducedProperty(key, value) ;
-        if (value !== undefined && ret === undefined) {
+        if ((value !== undefined) && ret === undefined) {
           ret = this[key] = value;
         }
-        return ret;
+        return ret ;
       },
 
-      indexOf: indexOf,
+      // If browser did not implement indexOf natively, then override with
+      // specialized version
+      indexOf: function(object, startAt) {
+        var idx, len = this.length;
 
-      lastIndexOf: lastIndexOf,
+        if (startAt === undefined) startAt = 0;
+        else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
+        if (startAt < 0) startAt += len;
+
+        for(idx=startAt;idx<len;idx++) {
+          if (this[idx] === object) return idx ;
+        }
+        return -1;
+      },
+
+      lastIndexOf: function(object, startAt) {
+        var idx, len = this.length;
+
+        if (startAt === undefined) startAt = len-1;
+        else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
+        if (startAt < 0) startAt += len;
+
+        for(idx=startAt;idx>=0;idx--) {
+          if (this[idx] === object) return idx ;
+        }
+        return -1;
+      },
 
       copy: function(deep) {
         if (deep) {
@@ -35109,7 +33614,7 @@ enifed("ember-runtime/system/native_array",
       if (Array.prototype[methodName]) ignore.push(methodName);
     });
 
-    if (ignore.length > 0) {
+    if (ignore.length>0) {
       NativeArray = NativeArray.without.apply(NativeArray, ignore);
     }
 
@@ -35180,7 +33685,7 @@ enifed("ember-runtime/system/native_array",
     __exports__.NativeArray = NativeArray;
     __exports__["default"] = NativeArray;
   });
-enifed("ember-runtime/system/object",
+define("ember-runtime/system/object",
   ["ember-runtime/system/core_object","ember-runtime/mixins/observable","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -35209,12 +33714,42 @@ enifed("ember-runtime/system/object",
 
     __exports__["default"] = EmberObject;
   });
-enifed("ember-runtime/system/object_proxy",
-  ["ember-runtime/system/object","ember-runtime/mixins/-proxy","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+define("ember-runtime/system/object_proxy",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/observer","ember-metal/property_events","ember-metal/computed","ember-metal/properties","ember-metal/mixin","ember-runtime/system/string","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
-    var EmberObject = __dependency1__["default"];
-    var _ProxyMixin = __dependency2__["default"];
+    /**
+    @module ember
+    @submodule ember-runtime
+    */
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var meta = __dependency4__.meta;
+    var addObserver = __dependency5__.addObserver;
+    var removeObserver = __dependency5__.removeObserver;
+    var addBeforeObserver = __dependency5__.addBeforeObserver;
+    var removeBeforeObserver = __dependency5__.removeBeforeObserver;
+    var propertyWillChange = __dependency6__.propertyWillChange;
+    var propertyDidChange = __dependency6__.propertyDidChange;
+    var computed = __dependency7__.computed;
+    var defineProperty = __dependency8__.defineProperty;
+    var observer = __dependency9__.observer;
+    var fmt = __dependency10__.fmt;
+    var EmberObject = __dependency11__["default"];
+
+    function contentPropertyWillChange(content, contentKey) {
+      var key = contentKey.slice(8); // remove "content."
+      if (key in this) { return; }  // if shadowed in proxy
+      propertyWillChange(this, key);
+    }
+
+    function contentPropertyDidChange(content, contentKey) {
+      var key = contentKey.slice(8); // remove "content."
+      if (key in this) { return; } // if shadowed in proxy
+      propertyDidChange(this, key);
+    }
 
     /**
       `Ember.ObjectProxy` forwards all properties not defined by the proxy itself
@@ -35282,12 +33817,60 @@ enifed("ember-runtime/system/object_proxy",
       @class ObjectProxy
       @namespace Ember
       @extends Ember.Object
-      @extends Ember._ProxyMixin
     */
+    var ObjectProxy = EmberObject.extend({
+      /**
+        The object whose properties will be forwarded.
 
-    __exports__["default"] = EmberObject.extend(_ProxyMixin);
+        @property content
+        @type Ember.Object
+        @default null
+      */
+      content: null,
+      _contentDidChange: observer('content', function() {
+              }),
+
+      isTruthy: computed.bool('content'),
+
+      _debugContainerKey: null,
+
+      willWatchProperty: function (key) {
+        var contentKey = 'content.' + key;
+        addBeforeObserver(this, contentKey, null, contentPropertyWillChange);
+        addObserver(this, contentKey, null, contentPropertyDidChange);
+      },
+
+      didUnwatchProperty: function (key) {
+        var contentKey = 'content.' + key;
+        removeBeforeObserver(this, contentKey, null, contentPropertyWillChange);
+        removeObserver(this, contentKey, null, contentPropertyDidChange);
+      },
+
+      unknownProperty: function (key) {
+        var content = get(this, 'content');
+        if (content) {
+          return get(content, key);
+        }
+      },
+
+      setUnknownProperty: function (key, value) {
+        var m = meta(this);
+        if (m.proto === this) {
+          // if marked as prototype then just defineProperty
+          // rather than delegate
+          defineProperty(this, key, null, value);
+          return value;
+        }
+
+        var content = get(this, 'content');
+                return set(content, key, value);
+      }
+
+    });
+
+    __exports__["default"] = ObjectProxy;
   });
-enifed("ember-runtime/system/set",
+define("ember-runtime/system/set",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/is_none","ember-runtime/system/string","ember-runtime/system/core_object","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/enumerable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-metal/error","ember-metal/property_events","ember-metal/mixin","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
     "use strict";
@@ -35296,7 +33879,7 @@ enifed("ember-runtime/system/set",
     @submodule ember-runtime
     */
     var Ember = __dependency1__["default"];
-    // Ember.isNone, Ember.A
+    // Ember.isNone
 
     var get = __dependency2__.get;
     var set = __dependency3__.set;
@@ -35648,7 +34231,7 @@ enifed("ember-runtime/system/set",
       //
 
       init: function(items) {
-                this._super();
+        this._super();
         if (items) this.addObjects(items);
       },
 
@@ -35672,10 +34255,10 @@ enifed("ember-runtime/system/set",
         if (get(this, 'isFrozen')) throw new EmberError(FROZEN_ERROR);
         if (isNone(obj)) return this; // nothing to do
 
-        var guid = guidFor(obj);
-        var idx  = this[guid];
-        var len  = get(this, 'length');
-        var added;
+        var guid = guidFor(obj),
+            idx  = this[guid],
+            len  = get(this, 'length'),
+            added ;
 
         if (idx>=0 && idx<len && (this[idx] === obj)) return this; // added
 
@@ -35700,12 +34283,12 @@ enifed("ember-runtime/system/set",
         if (get(this, 'isFrozen')) throw new EmberError(FROZEN_ERROR);
         if (isNone(obj)) return this; // nothing to do
 
-        var guid = guidFor(obj);
-        var idx  = this[guid];
-        var len = get(this, 'length');
-        var isFirst = idx === 0;
-        var isLast = idx === len-1;
-        var last, removed;
+        var guid = guidFor(obj),
+            idx  = this[guid],
+            len = get(this, 'length'),
+            isFirst = idx === 0,
+            isLast = idx === len-1,
+            last, removed;
 
 
         if (idx>=0 && idx<len && (this[idx] === obj)) {
@@ -35758,9 +34341,9 @@ enifed("ember-runtime/system/set",
       }
     });
   });
-enifed("ember-runtime/system/string",
-  ["ember-metal/core","ember-metal/utils","ember-metal/cache","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+define("ember-runtime/system/string",
+  ["ember-metal/core","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -35771,68 +34354,23 @@ enifed("ember-runtime/system/string",
     var isArray = __dependency2__.isArray;
     var emberInspect = __dependency2__.inspect;
 
-    var Cache = __dependency3__["default"];
-
     var STRING_DASHERIZE_REGEXP = (/[ _]/g);
-
-    var STRING_DASHERIZE_CACHE = new Cache(1000, function(key) {
-      return decamelize(key).replace(STRING_DASHERIZE_REGEXP, '-');
-    });
-
-    var CAMELIZE_CACHE = new Cache(1000, function(key) {
-      return key.replace(STRING_CAMELIZE_REGEXP, function(match, separator, chr) {
-        return chr ? chr.toUpperCase() : '';
-      }).replace(/^([A-Z])/, function(match, separator, chr) {
-        return match.toLowerCase();
-      });
-    });
-
-    var CLASSIFY_CACHE = new Cache(1000, function(str) {
-      var parts = str.split(".");
-      var out = [];
-
-      for (var i=0, l=parts.length; i<l; i++) {
-        var camelized = camelize(parts[i]);
-        out.push(camelized.charAt(0).toUpperCase() + camelized.substr(1));
-      }
-
-      return out.join(".");
-    });
-
-    var UNDERSCORE_CACHE = new Cache(1000, function(str) {
-      return str.replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2').
-        replace(STRING_UNDERSCORE_REGEXP_2, '_').toLowerCase();
-    });
-
-    var CAPITALIZE_CACHE = new Cache(1000, function(str) {
-      return str.charAt(0).toUpperCase() + str.substr(1);
-    });
-
-    var DECAMELIZE_CACHE = new Cache(1000, function(str) {
-      return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();
-    });
-
+    var STRING_DASHERIZE_CACHE = {};
     var STRING_DECAMELIZE_REGEXP = (/([a-z\d])([A-Z])/g);
     var STRING_CAMELIZE_REGEXP = (/(\-|_|\.|\s)+(.)?/g);
     var STRING_UNDERSCORE_REGEXP_1 = (/([a-z\d])([A-Z]+)/g);
     var STRING_UNDERSCORE_REGEXP_2 = (/\-|\s+/g);
 
     function fmt(str, formats) {
-      var cachedFormats = formats;
-
-      if (!isArray(cachedFormats) || arguments.length > 2) {
-        cachedFormats = new Array(arguments.length - 1);
-
-        for (var i = 1, l = arguments.length; i < l; i++) {
-          cachedFormats[i - 1] = arguments[i];
-        }
+      if (!isArray(formats) || arguments.length > 2) {
+        formats = Array.prototype.slice.call(arguments, 1);
       }
 
       // first, replace any ORDERED replacements.
       var idx  = 0; // the current index for non-numerical replacements
       return str.replace(/%@([0-9]+)?/g, function(s, argIndex) {
         argIndex = (argIndex) ? parseInt(argIndex, 10) - 1 : idx++;
-        s = cachedFormats[argIndex];
+        s = formats[argIndex];
         return (s === null) ? '(null)' : (s === undefined) ? '' : emberInspect(s);
       });
     }
@@ -35851,27 +34389,51 @@ enifed("ember-runtime/system/string",
     }
 
     function decamelize(str) {
-      return DECAMELIZE_CACHE.get(str);
+      return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();
     }
 
     function dasherize(str) {
-      return STRING_DASHERIZE_CACHE.get(str);
+      var cache = STRING_DASHERIZE_CACHE,
+          hit   = cache.hasOwnProperty(str),
+          ret;
+
+      if (hit) {
+        return cache[str];
+      } else {
+        ret = decamelize(str).replace(STRING_DASHERIZE_REGEXP,'-');
+        cache[str] = ret;
+      }
+
+      return ret;
     }
 
     function camelize(str) {
-      return CAMELIZE_CACHE.get(str);
+      return str.replace(STRING_CAMELIZE_REGEXP, function(match, separator, chr) {
+        return chr ? chr.toUpperCase() : '';
+      }).replace(/^([A-Z])/, function(match, separator, chr) {
+        return match.toLowerCase();
+      });
     }
 
     function classify(str) {
-      return CLASSIFY_CACHE.get(str);
+      var parts = str.split("."),
+          out = [];
+
+      for (var i=0, l=parts.length; i<l; i++) {
+        var camelized = camelize(parts[i]);
+        out.push(camelized.charAt(0).toUpperCase() + camelized.substr(1));
+      }
+
+      return out.join(".");
     }
 
     function underscore(str) {
-      return UNDERSCORE_CACHE.get(str);
+      return str.replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2').
+        replace(STRING_UNDERSCORE_REGEXP_2, '_').toLowerCase();
     }
 
     function capitalize(str) {
-      return CAPITALIZE_CACHE.get(str);
+      return str.charAt(0).toUpperCase() + str.substr(1);
     }
 
     /**
@@ -36073,7 +34635,7 @@ enifed("ember-runtime/system/string",
     __exports__.underscore = underscore;
     __exports__.capitalize = capitalize;
   });
-enifed("ember-runtime/system/subarray",
+define("ember-runtime/system/subarray",
   ["ember-metal/property_get","ember-metal/error","ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -36116,15 +34678,15 @@ enifed("ember-runtime/system/subarray",
 
         @method addItem
 
-        @param {Number} index The index of the item in the tracked array.
-        @param {Boolean} match `true` iff the item is included in the subarray.
+        @param {number} index The index of the item in the tracked array.
+        @param {boolean} match `true` iff the item is included in the subarray.
 
         @return {number} The index of the item in the subarray.
       */
       addItem: function(index, match) {
-        var returnValue = -1;
-        var itemType = match ? RETAIN : FILTER;
-        var self = this;
+        var returnValue = -1,
+            itemType = match ? RETAIN : FILTER,
+            self = this;
 
         this._findOperation(index, function(operation, operationIndex, rangeStart, rangeEnd, seenInSubArray) {
           var newOperation, splitOperation;
@@ -36169,14 +34731,14 @@ enifed("ember-runtime/system/subarray",
 
         @method removeItem
 
-        @param {Number} index The index of the item in the tracked array.
+        @param {number} index The index of the item in the tracked array.
 
         @return {number} The index of the item in the subarray, or `-1` if the item
         was not in the subarray.
       */
       removeItem: function(index) {
-        var returnValue = -1;
-        var self = this;
+        var returnValue = -1,
+            self = this;
 
         this._findOperation(index, function (operation, operationIndex, rangeStart, rangeEnd, seenInSubArray) {
           if (operation.type === RETAIN) {
@@ -36198,8 +34760,12 @@ enifed("ember-runtime/system/subarray",
 
 
       _findOperation: function (index, foundCallback, notFoundCallback) {
-        var seenInSubArray = 0;
-        var operationIndex, len, operation, rangeStart, rangeEnd;
+        var operationIndex,
+            len,
+            operation,
+            rangeStart,
+            rangeEnd,
+            seenInSubArray = 0;
 
         // OPTIMIZE: change to balanced tree
         // find leftmost operation to the right of `index`
@@ -36219,8 +34785,8 @@ enifed("ember-runtime/system/subarray",
       },
 
       _composeAt: function(index) {
-        var op = this._operations[index];
-        var otherOp;
+        var op = this._operations[index],
+            otherOp;
 
         if (!op) {
           // Composing out of bounds is a no-op, as when removing the last operation
@@ -36255,7 +34821,7 @@ enifed("ember-runtime/system/subarray",
       }
     };
   });
-enifed("ember-runtime/system/tracked_array",
+define("ember-runtime/system/tracked_array",
   ["ember-metal/property_get","ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -36275,7 +34841,7 @@ enifed("ember-runtime/system/tracked_array",
 
       @class TrackedArray
       @namespace Ember
-      @param {Array} [items=[]] The array to be tracked.  This is used just to get
+      @param {array} [items=[]] The array to be tracked.  This is used just to get
       the initial items for the starting state of retain:n.
     */
     function TrackedArray(items) {
@@ -36307,11 +34873,15 @@ enifed("ember-runtime/system/tracked_array",
         var count = get(newItems, 'length');
         if (count < 1) { return; }
 
-        var match = this._findArrayOperation(index);
-        var arrayOperation = match.operation;
-        var arrayOperationIndex = match.index;
-        var arrayOperationRangeStart = match.rangeStart;
-        var composeIndex, splitIndex, splitItems, splitArrayOperation, newArrayOperation;
+        var match = this._findArrayOperation(index),
+            arrayOperation = match.operation,
+            arrayOperationIndex = match.index,
+            arrayOperationRangeStart = match.rangeStart,
+            composeIndex,
+            splitIndex,
+            splitItems,
+            splitArrayOperation,
+            newArrayOperation;
 
         newArrayOperation = new ArrayOperation(INSERT, count, newItems);
 
@@ -36343,11 +34913,12 @@ enifed("ember-runtime/system/tracked_array",
       removeItems: function (index, count) {
         if (count < 1) { return; }
 
-        var match = this._findArrayOperation(index);
-        var arrayOperation = match.operation;
-        var arrayOperationIndex = match.index;
-        var arrayOperationRangeStart = match.rangeStart;
-        var newArrayOperation, composeIndex;
+        var match = this._findArrayOperation(index),
+            arrayOperation = match.operation,
+            arrayOperationIndex = match.index,
+            arrayOperationRangeStart = match.rangeStart,
+            newArrayOperation,
+            composeIndex;
 
         newArrayOperation = new ArrayOperation(DELETE, count);
         if (!match.split) {
@@ -36375,11 +34946,11 @@ enifed("ember-runtime/system/tracked_array",
         `Ember.TrackedArray.{RETAIN, DELETE, INSERT}`
 
         @method apply
-        @param {Function} callback
+        @param {function} callback
       */
       apply: function (callback) {
-        var items = [];
-        var offset = 0;
+        var items = [],
+            offset = 0;
 
         forEach(this._operations, function (arrayOperation, operationIndex) {
           callback(arrayOperation.items, offset, arrayOperation.type, operationIndex);
@@ -36398,15 +34969,17 @@ enifed("ember-runtime/system/tracked_array",
 
         @method _findArrayOperation
 
-        @param {Number} index the index of the item whose operation information
+        @param {number} index the index of the item whose operation information
         should be returned.
         @private
       */
       _findArrayOperation: function (index) {
-        var split = false;
-        var arrayOperationIndex, arrayOperation,
-            arrayOperationRangeStart, arrayOperationRangeEnd,
-            len;
+        var arrayOperationIndex,
+            len,
+            split = false,
+            arrayOperation,
+            arrayOperationRangeStart,
+            arrayOperationRangeEnd;
 
         // OPTIMIZE: we could search these faster if we kept a balanced tree.
         // find leftmost arrayOperation to the right of `index`
@@ -36444,11 +35017,11 @@ enifed("ember-runtime/system/tracked_array",
 
       // see SubArray for a better implementation.
       _composeInsert: function (index) {
-        var newArrayOperation = this._operations[index];
-        var leftArrayOperation = this._operations[index-1]; // may be undefined
-        var rightArrayOperation = this._operations[index+1]; // may be undefined
-        var leftOp = leftArrayOperation && leftArrayOperation.type;
-        var rightOp = rightArrayOperation && rightArrayOperation.type;
+        var newArrayOperation = this._operations[index],
+            leftArrayOperation = this._operations[index-1], // may be undefined
+            rightArrayOperation = this._operations[index+1], // may be undefined
+            leftOp = leftArrayOperation && leftArrayOperation.type,
+            rightOp = rightArrayOperation && rightArrayOperation.type;
 
         if (leftOp === INSERT) {
             // merge left
@@ -36473,15 +35046,15 @@ enifed("ember-runtime/system/tracked_array",
       },
 
       _composeDelete: function (index) {
-        var arrayOperation = this._operations[index];
-        var deletesToGo = arrayOperation.count;
-        var leftArrayOperation = this._operations[index-1]; // may be undefined
-        var leftOp = leftArrayOperation && leftArrayOperation.type;
-        var nextArrayOperation;
-        var nextOp;
-        var nextCount;
-        var removeNewAndNextOp = false;
-        var removedItems = [];
+        var arrayOperation = this._operations[index],
+            deletesToGo = arrayOperation.count,
+            leftArrayOperation = this._operations[index-1], // may be undefined
+            leftOp = leftArrayOperation && leftArrayOperation.type,
+            nextArrayOperation,
+            nextOp,
+            nextCount,
+            removeNewAndNextOp = false,
+            removedItems = [];
 
         if (leftOp === DELETE) {
           arrayOperation = leftArrayOperation;
@@ -36554,10 +35127,10 @@ enifed("ember-runtime/system/tracked_array",
 
       @method ArrayOperation
       @private
-      @param {String} type The type of the operation.  One of
+      @param {string} type The type of the operation.  One of
       `Ember.TrackedArray.{RETAIN, INSERT, DELETE}`
-      @param {Number} count The number of items in this operation.
-      @param {Array} items The items of the operation, if included.  RETAIN and
+      @param {number} count The number of items in this operation.
+      @param {array} items The items of the operation, if included.  RETAIN and
       INSERT include their items, DELETE does not.
     */
     function ArrayOperation (operation, count, items) {
@@ -36573,10 +35146,10 @@ enifed("ember-runtime/system/tracked_array",
       @method ArrayOperationMatch
       @private
       @param {ArrayOperation} operation
-      @param {Number} index The index of `operation` in the array of operations.
-      @param {Boolean} split Whether or not the item index searched for would
+      @param {number} index The index of `operation` in the array of operations.
+      @param {boolean} split Whether or not the item index searched for would
       require a split for a new operation type.
-      @param {Number} rangeStart The index of the first item in the operation,
+      @param {number} rangeStart The index of the first item in the operation,
       with respect to the tracked array.  The index of the last item can be computed
       from `rangeStart` and `operation.count`.
     */
@@ -36587,9 +35160,9 @@ enifed("ember-runtime/system/tracked_array",
       this.rangeStart = rangeStart;
     }
   });
-enifed("ember-views",
-  ["ember-runtime","ember-views/system/jquery","ember-views/system/utils","ember-views/system/render_buffer","ember-views/system/ext","ember-views/views/states","ember-views/views/core_view","ember-views/views/view","ember-views/views/container_view","ember-views/views/collection_view","ember-views/views/component","ember-views/system/event_dispatcher","ember-views/mixins/view_target_action_support","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
+define("ember-views",
+  ["ember-runtime","ember-views/system/jquery","ember-views/system/utils","ember-views/system/render_buffer","ember-views/system/ext","ember-views/views/states","ember-views/views/core_view","ember-views/views/view","ember-views/views/view_collection","ember-views/views/container_view","ember-views/views/collection_view","ember-views/views/component","ember-views/system/event_dispatcher","ember-views/mixins/view_target_action_support","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {
     "use strict";
     /**
     Ember Views
@@ -36603,6 +35176,7 @@ enifed("ember-views",
     // BEGIN IMPORTS
     var Ember = __dependency1__["default"];
     var jQuery = __dependency2__["default"];
+    var setInnerHTML = __dependency3__.setInnerHTML;
     var isSimpleClick = __dependency3__.isSimpleClick;
     var RenderBuffer = __dependency4__["default"];
      // for the side effect of extending Ember.run.queues
@@ -36611,12 +35185,13 @@ enifed("ember-views",
 
     var CoreView = __dependency7__["default"];
     var View = __dependency8__["default"];
-    var ContainerView = __dependency9__["default"];
-    var CollectionView = __dependency10__["default"];
-    var Component = __dependency11__["default"];
+    var ViewCollection = __dependency9__["default"];
+    var ContainerView = __dependency10__["default"];
+    var CollectionView = __dependency11__["default"];
+    var Component = __dependency12__["default"];
 
-    var EventDispatcher = __dependency12__["default"];
-    var ViewTargetActionSupport = __dependency13__["default"];
+    var EventDispatcher = __dependency13__["default"];
+    var ViewTargetActionSupport = __dependency14__["default"];
     // END IMPORTS
 
     /**
@@ -36633,6 +35208,7 @@ enifed("ember-views",
     Ember.RenderBuffer = RenderBuffer;
 
     var ViewUtils = Ember.ViewUtils = {};
+    ViewUtils.setInnerHTML = setInnerHTML;
     ViewUtils.isSimpleClick = isSimpleClick;
 
     Ember.CoreView = CoreView;
@@ -36640,6 +35216,7 @@ enifed("ember-views",
     Ember.View.states = states;
     Ember.View.cloneStates = cloneStates;
 
+    Ember._ViewCollection = ViewCollection;
     Ember.ContainerView = ContainerView;
     Ember.CollectionView = CollectionView;
     Ember.Component = Component;
@@ -36648,7 +35225,7 @@ enifed("ember-views",
 
     __exports__["default"] = Ember;
   });
-enifed("ember-views/mixins/component_template_deprecation",
+define("ember-views/mixins/component_template_deprecation",
   ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -36691,8 +35268,8 @@ enifed("ember-views/mixins/component_template_deprecation",
         // there is another Mixin loaded first.
         this._super.apply(this, arguments);
 
-        var deprecatedProperty, replacementProperty;
-        var layoutSpecified = (props.layoutName || props.layout || get(this, 'layoutName'));
+        var deprecatedProperty, replacementProperty,
+            layoutSpecified = (props.layoutName || props.layout || get(this, 'layoutName'));
 
         if (props.templateName && !layoutSpecified) {
           deprecatedProperty = 'templateName';
@@ -36715,7 +35292,7 @@ enifed("ember-views/mixins/component_template_deprecation",
       }
     });
   });
-enifed("ember-views/mixins/view_target_action_support",
+define("ember-views/mixins/view_target_action_support",
   ["ember-metal/mixin","ember-runtime/mixins/target_action_support","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -36778,31 +35355,9 @@ enifed("ember-views/mixins/view_target_action_support",
       actionContext: alias('context')
     });
   });
-enifed("ember-views/system/action_manager",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    /**
-    @module ember
-    @submodule ember-views
-    */
-
-    function ActionManager() {}
-
-    /**
-      Global action id hash.
-
-      @private
-      @property registeredActions
-      @type Object
-    */
-    ActionManager.registeredActions = {};
-
-    __exports__["default"] = ActionManager;
-  });
-enifed("ember-views/system/event_dispatcher",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/object","ember-views/system/jquery","ember-views/system/action_manager","ember-views/views/view","ember-metal/merge","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+define("ember-views/system/event_dispatcher",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/object","ember-views/system/jquery","ember-views/views/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -36819,9 +35374,9 @@ enifed("ember-views/system/event_dispatcher",
     var fmt = __dependency7__.fmt;
     var EmberObject = __dependency8__["default"];
     var jQuery = __dependency9__["default"];
-    var ActionManager = __dependency10__["default"];
-    var View = __dependency11__["default"];
-    var merge = __dependency12__["default"];
+    var View = __dependency10__["default"];
+
+    var ActionHelper;
 
     //ES6TODO:
     // find a better way to do Ember.View.views without global state
@@ -36940,7 +35495,7 @@ enifed("ember-views/system/event_dispatcher",
       setup: function(addedEvents, rootElement) {
         var event, events = get(this, 'events');
 
-        merge(events, addedEvents || {});
+        jQuery.extend(events, addedEvents || {});
 
         if (!isNone(rootElement)) {
           set(this, 'rootElement', rootElement);
@@ -36977,8 +35532,8 @@ enifed("ember-views/system/event_dispatcher",
         var self = this;
 
         rootElement.on(event + '.ember', '.ember-view', function(evt, triggeringManager) {
-          var view = View.views[this.id];
-          var result = true;
+          var view = View.views[this.id],
+              result = true;
 
           var manager = self.canDispatchToEventManager ? self._findNearestEventManager(view, eventName) : null;
 
@@ -36992,8 +35547,11 @@ enifed("ember-views/system/event_dispatcher",
         });
 
         rootElement.on(event + '.ember', '[data-ember-action]', function(evt) {
-          var actionId = jQuery(evt.currentTarget).attr('data-ember-action');
-          var action   = ActionManager.registeredActions[actionId];
+          //ES6TODO: Needed for ActionHelper (generally not available in ember-views test suite)
+          if (!ActionHelper) { ActionHelper = requireModule("ember-routing-handlebars/helpers/action")["ActionHelper"]; }
+
+          var actionId = jQuery(evt.currentTarget).attr('data-ember-action'),
+              action   = ActionHelper.registeredActions[actionId];
 
           // We have to check for action here since in some cases, jQuery will trigger
           // an event on `removeChild` (i.e. focusout) after we've already torn down the
@@ -37044,11 +35602,11 @@ enifed("ember-views/system/event_dispatcher",
       },
 
       toString: function() {
-        return '(EventDispatcher)';
+        return '(EventDisptacher)';
       }
     });
   });
-enifed("ember-views/system/ext",
+define("ember-views/system/ext",
   ["ember-metal/run_loop"],
   function(__dependency1__) {
     "use strict";
@@ -37066,7 +35624,7 @@ enifed("ember-views/system/ext",
     run._addQueue('render', 'actions');
     run._addQueue('afterRender', 'render');
   });
-enifed("ember-views/system/jquery",
+define("ember-views/system/jquery",
   ["ember-metal/core","ember-runtime/system/string","ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -37087,8 +35645,8 @@ enifed("ember-views/system/jquery",
     */
 
     var jQuery = (Ember.imports && Ember.imports.jQuery) || (this && this.jQuery);
-    if (!jQuery && typeof eriuqer === 'function') {
-      jQuery = eriuqer('jquery');
+    if (!jQuery && typeof require === 'function') {
+      jQuery = require('jquery');
     }
 
     
@@ -37109,74 +35667,31 @@ enifed("ember-views/system/jquery",
 
     __exports__["default"] = jQuery;
   });
-enifed("ember-views/system/render_buffer",
-  ["ember-views/system/jquery","morph","ember-metal/core","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+define("ember-views/system/render_buffer",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-views/system/utils","ember-views/system/jquery","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     /**
     @module ember
     @submodule ember-views
     */
 
-    var jQuery = __dependency1__["default"];
-    var DOMHelper = __dependency2__.DOMHelper;
-    var Ember = __dependency3__["default"];
-    var create = __dependency4__.create;
+    var Ember = __dependency1__["default"];
+    // jQuery
 
-    // The HTML spec allows for "omitted start tags". These tags are optional
-    // when their intended child is the first thing in the parent tag. For
-    // example, this is a tbody start tag:
-    //
-    // <table>
-    //   <tbody>
-    //     <tr>
-    //
-    // The tbody may be omitted, and the browser will accept and render:
-    //
-    // <table>
-    //   <tr>
-    //
-    // However, the omitted start tag will still be added to the DOM. Here
-    // we test the string and context to see if the browser is about to
-    // perform this cleanup, but with a special allowance for disregarding
-    // <script tags. This disregarding of <script being the first child item
-    // may bend the offical spec a bit, and is only needed for Handlebars
-    // templates.
-    //
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags
-    // describes which tags are omittable. The spec for tbody and colgroup
-    // explains this behavior:
-    //
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-tbody-element
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-colgroup-element
-    //
-    var omittedStartTagChildren = {
-      tr: document.createElement('tbody'),
-      col: document.createElement('colgroup')
-    };
-
-    var omittedStartTagChildTest = /(?:<script)*.*?<([\w:]+)/i;
-
-    function detectOmittedStartTag(string, contextualElement){
-      // Omitted start tags are only inside table tags.
-      if (contextualElement.tagName === 'TABLE') {
-        var omittedStartTagChildMatch = omittedStartTagChildTest.exec(string);
-        if (omittedStartTagChildMatch) {
-          // It is already asserted that the contextual element is a table
-          // and not the proper start tag. Just look up the start tag.
-          return omittedStartTagChildren[omittedStartTagChildMatch[1].toLowerCase()];
-        }
-      }
-    }
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var setInnerHTML = __dependency4__.setInnerHTML;
+    var jQuery = __dependency5__["default"];
 
     function ClassSet() {
-      this.seen = create(null);
+      this.seen = {};
       this.list = [];
     }
 
     ClassSet.prototype = {
       add: function(string) {
-        if (this.seen[string] === true) { return; }
+        if (string in this.seen) { return; }
         this.seen[string] = true;
 
         this.list.push(string);
@@ -37230,8 +35745,8 @@ enifed("ember-views/system/render_buffer",
     // From http://msdn.microsoft.com/en-us/library/ie/ms536389(v=vs.85).aspx:
     // "To include the NAME attribute at run time on objects created with the createElement method, use the eTag."
     var canSetNameOnInputs = (function() {
-      var div = document.createElement('div');
-      var el = document.createElement('input');
+      var div = document.createElement('div'),
+          el = document.createElement('input');
 
       el.setAttribute('name', 'foo');
       div.appendChild(el);
@@ -37240,51 +35755,34 @@ enifed("ember-views/system/render_buffer",
     })();
 
     /**
-      `Ember.renderBuffer` gathers information regarding the view and generates the
-      final representation. `Ember.renderBuffer` will generate HTML which can be pushed
+      `Ember.RenderBuffer` gathers information regarding the view and generates the
+      final representation. `Ember.RenderBuffer` will generate HTML which can be pushed
       to the DOM.
 
        ```javascript
-       var buffer = Ember.renderBuffer('div', contextualElement);
+       var buffer = Ember.RenderBuffer('div');
       ```
 
-      @method renderBuffer
+      @class RenderBuffer
       @namespace Ember
+      @constructor
       @param {String} tagName tag name (such as 'div' or 'p') used for the buffer
     */
-    __exports__["default"] = function renderBuffer(tagName, contextualElement) {
-      return new _RenderBuffer(tagName, contextualElement); // jshint ignore:line
+    __exports__["default"] = function RenderBuffer(tagName) {
+      return new _RenderBuffer(tagName); // jshint ignore:line
     }
 
-    function _RenderBuffer(tagName, contextualElement) {
-      this.tagName = tagName;
-      this._outerContextualElement = contextualElement;
-      this.buffer = null;
-      this.childViews = [];
-      this.dom = new DOMHelper();
+    function _RenderBuffer(tagName) {
+      this.tagNames = [tagName || null];
+      this.buffer = "";
     }
 
     _RenderBuffer.prototype = {
 
-      reset: function(tagName, contextualElement) {
-        this.tagName = tagName;
-        this.buffer = null;
-        this._element = null;
-        this._outerContextualElement = contextualElement;
-        this.elementClasses = null;
-        this.elementId = null;
-        this.elementAttributes = null;
-        this.elementProperties = null;
-        this.elementTag = null;
-        this.elementStyle = null;
-        this.childViews.length = 0;
-      },
-
       // The root view's element
       _element: null,
 
-      // The root view's contextualElement
-      _outerContextualElement: null,
+      _hasElement: true,
 
       /**
         An internal set used to de-dupe class names when `addClass()` is
@@ -37359,7 +35857,7 @@ enifed("ember-views/system/render_buffer",
         example, if you wanted to create a `p` tag, then you would call
 
         ```javascript
-        Ember.RenderBuffer('p', contextualElement)
+        Ember.RenderBuffer('p')
         ```
 
         @property elementTag
@@ -37383,31 +35881,6 @@ enifed("ember-views/system/render_buffer",
       */
       elementStyle: null,
 
-      pushChildView: function (view) {
-        var index = this.childViews.length;
-        this.childViews[index] = view;
-        this.push("<script id='morph-"+index+"' type='text/x-placeholder'>\x3C/script>");
-      },
-
-      hydrateMorphs: function (contextualElement) {
-        var childViews = this.childViews;
-        var el = this._element;
-        for (var i=0,l=childViews.length; i<l; i++) {
-          var childView = childViews[i];
-          var ref = el.querySelector('#morph-'+i);
-
-          
-          var parent = ref.parentNode;
-
-          childView._morph = this.dom.insertMorphBefore(
-            parent,
-            ref,
-            parent.nodeType === 1 ? parent : contextualElement
-          );
-          parent.removeChild(ref);
-        }
-      },
-
       /**
         Adds a string of HTML to the `RenderBuffer`.
 
@@ -37415,11 +35888,8 @@ enifed("ember-views/system/render_buffer",
         @param {String} string HTML to push into the buffer
         @chainable
       */
-      push: function(content) {
-        if (this.buffer === null) {
-          this.buffer = '';
-        }
-        this.buffer += content;
+      push: function(string) {
+        this.buffer += string;
         return this;
       },
 
@@ -37441,8 +35911,7 @@ enifed("ember-views/system/render_buffer",
 
       setClasses: function(classNames) {
         this.elementClasses = null;
-        var len = classNames.length;
-        var i;
+        var len = classNames.length, i;
         for (i = 0; i < len; i++) {
           this.addClass(classNames[i]);
         }
@@ -37548,15 +36017,102 @@ enifed("ember-views/system/render_buffer",
         return this;
       },
 
+      begin: function(tagName) {
+        this.tagNames.push(tagName || null);
+        return this;
+      },
+
+      pushOpeningTag: function() {
+        var tagName = this.currentTagName();
+        if (!tagName) { return; }
+
+        if (this._hasElement && !this._element && this.buffer.length === 0) {
+          this._element = this.generateElement();
+          return;
+        }
+
+        var buffer = this.buffer,
+            id = this.elementId,
+            classes = this.classes,
+            attrs = this.elementAttributes,
+            props = this.elementProperties,
+            style = this.elementStyle,
+            attr, prop;
+
+        buffer += '<' + stripTagName(tagName);
+
+        if (id) {
+          buffer += ' id="' + escapeAttribute(id) + '"';
+          this.elementId = null;
+        }
+        if (classes) {
+          buffer += ' class="' + escapeAttribute(classes.join(' ')) + '"';
+          this.classes = null;
+          this.elementClasses = null;
+        }
+
+        if (style) {
+          buffer += ' style="';
+
+          for (prop in style) {
+            if (style.hasOwnProperty(prop)) {
+              buffer += prop + ':' + escapeAttribute(style[prop]) + ';';
+            }
+          }
+
+          buffer += '"';
+
+          this.elementStyle = null;
+        }
+
+        if (attrs) {
+          for (attr in attrs) {
+            if (attrs.hasOwnProperty(attr)) {
+              buffer += ' ' + attr + '="' + escapeAttribute(attrs[attr]) + '"';
+            }
+          }
+
+          this.elementAttributes = null;
+        }
+
+        if (props) {
+          for (prop in props) {
+            if (props.hasOwnProperty(prop)) {
+              var value = props[prop];
+              if (value || typeof(value) === 'number') {
+                if (value === true) {
+                  buffer += ' ' + prop + '="' + prop + '"';
+                } else {
+                  buffer += ' ' + prop + '="' + escapeAttribute(props[prop]) + '"';
+                }
+              }
+            }
+          }
+
+          this.elementProperties = null;
+        }
+
+        buffer += '>';
+        this.buffer = buffer;
+      },
+
+      pushClosingTag: function() {
+        var tagName = this.tagNames.pop();
+        if (tagName) { this.buffer += '</' + stripTagName(tagName) + '>'; }
+      },
+
+      currentTagName: function() {
+        return this.tagNames[this.tagNames.length-1];
+      },
+
       generateElement: function() {
-        var tagName = this.tagName;
-        var id = this.elementId;
-        var classes = this.classes;
-        var attrs = this.elementAttributes;
-        var props = this.elementProperties;
-        var style = this.elementStyle;
-        var styleBuffer = '';
-        var attr, prop, tagString;
+        var tagName = this.tagNames.pop(), // pop since we don't need to close
+            id = this.elementId,
+            classes = this.classes,
+            attrs = this.elementAttributes,
+            props = this.elementProperties,
+            style = this.elementStyle,
+            styleBuffer = '', attr, prop, tagString;
 
         if (attrs && attrs.name && !canSetNameOnInputs) {
           // IE allows passing a tag to createElement. See note on `canSetNameOnInputs` above as well.
@@ -37565,15 +36121,15 @@ enifed("ember-views/system/render_buffer",
           tagString = tagName;
         }
 
-        var element = this.dom.createElement(tagString, this.outerContextualElement());
-        var $element = jQuery(element);
+        var element = document.createElement(tagString),
+            $element = jQuery(element);
 
         if (id) {
-          this.dom.setAttribute(element, 'id', id);
+          $element.attr('id', id);
           this.elementId = null;
         }
         if (classes) {
-          this.dom.setAttribute(element, 'class', classes.join(' '));
+          $element.attr('class', classes.join(' '));
           this.classes = null;
           this.elementClasses = null;
         }
@@ -37585,7 +36141,7 @@ enifed("ember-views/system/render_buffer",
             }
           }
 
-          this.dom.setAttribute(element, 'style', styleBuffer);
+          $element.attr('style', styleBuffer);
 
           this.elementStyle = null;
         }
@@ -37593,7 +36149,7 @@ enifed("ember-views/system/render_buffer",
         if (attrs) {
           for (attr in attrs) {
             if (attrs.hasOwnProperty(attr)) {
-              this.dom.setAttribute(element, attr, attrs[attr]);
+              $element.attr(attr, attrs[attr]);
             }
           }
 
@@ -37610,7 +36166,7 @@ enifed("ember-views/system/render_buffer",
           this.elementProperties = null;
         }
 
-        this._element = element;
+        return element;
       },
 
       /**
@@ -37619,26 +36175,12 @@ enifed("ember-views/system/render_buffer",
           of this buffer
       */
       element: function() {
-        var content = this.innerContent();
-        // No content means a text node buffer, with the content
-        // in _element. HandlebarsBoundView is an example.
-        if (content === null)  {
-          return this._element;
-        }
+        var html = this.innerString();
 
-        var contextualElement = this.innerContextualElement(content);
-        this.dom.detectNamespace(contextualElement);
-
-        if (!this._element) {
-          this._element = document.createDocumentFragment();
+        if (html) {
+          this._element = setInnerHTML(this._element, html);
         }
 
-        var nodes = this.dom.parseHTML(content, contextualElement);
-        while (nodes[0]) {
-          this._element.appendChild(nodes[0]);
-        }
-        this.hydrateMorphs(contextualElement);
-
         return this._element;
       },
 
@@ -37649,10 +36191,9 @@ enifed("ember-views/system/render_buffer",
         @return {String} The generated HTML
       */
       string: function() {
-        if (this._element) {
+        if (this._hasElement && this._element) {
           // Firefox versions < 11 do not have support for element.outerHTML.
-          var thisElement = this.element();
-          var outerHTML = thisElement.outerHTML;
+          var thisElement = this.element(), outerHTML = thisElement.outerHTML;
           if (typeof outerHTML === 'undefined') {
             return jQuery('<div/>').append(thisElement).html();
           }
@@ -37662,232 +36203,156 @@ enifed("ember-views/system/render_buffer",
         }
       },
 
-      outerContextualElement: function() {
-        if (!this._outerContextualElement) {
-                    this.outerContextualElement = document.body;
-        }
-        return this._outerContextualElement;
-      },
-
-      innerContextualElement: function(html) {
-        var innerContextualElement;
-        if (this._element && this._element.nodeType === 1) {
-          innerContextualElement = this._element;
-        } else {
-          innerContextualElement = this.outerContextualElement();
-        }
-
-        var omittedStartTag;
-        if (html) {
-          omittedStartTag = detectOmittedStartTag(html, innerContextualElement);
-        }
-        return omittedStartTag || innerContextualElement;
-      },
-
       innerString: function() {
-        var content = this.innerContent();
-        if (content && !content.nodeType) {
-          return content;
-        }
-      },
-
-      innerContent: function() {
         return this.buffer;
       }
     };
   });
-enifed("ember-views/system/renderer",
-  ["ember-metal/core","ember-metal-views/renderer","ember-metal/platform","ember-views/system/render_buffer","ember-metal/run_loop","ember-metal/property_set","ember-metal/instrumentation","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+define("ember-views/system/utils",
+  ["ember-metal/core","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
+    /* globals XMLSerializer */
+
     var Ember = __dependency1__["default"];
-    var Renderer = __dependency2__["default"];
-    var create = __dependency3__.create;
-    var renderBuffer = __dependency4__["default"];
-    var run = __dependency5__["default"];
-    var set = __dependency6__.set;
-    var _instrumentStart = __dependency7__._instrumentStart;
-    var subscribers = __dependency7__.subscribers;
+    // Ember.assert
 
-    function EmberRenderer() {
-      this.buffer = renderBuffer();
-      Renderer.call(this);
-    }
-    EmberRenderer.prototype = create(Renderer.prototype);
-    EmberRenderer.prototype.constructor = EmberRenderer;
-
-    var BAD_TAG_NAME_TEST_REGEXP = /[^a-zA-Z0-9\-]/;
-    var BAD_TAG_NAME_REPLACE_REGEXP = /[^a-zA-Z0-9\-]/g;
-
-    function stripTagName(tagName) {
-      if (!tagName) {
-        return tagName;
-      }
-
-      if (!BAD_TAG_NAME_TEST_REGEXP.test(tagName)) {
-        return tagName;
-      }
-
-      return tagName.replace(BAD_TAG_NAME_REPLACE_REGEXP, '');
-    }
-
-    EmberRenderer.prototype.scheduleRender =
-      function EmberRenderer_scheduleRender(ctx, fn) {
-        return run.scheduleOnce('render', ctx, fn);
-      };
-
-    EmberRenderer.prototype.cancelRender =
-      function EmberRenderer_cancelRender(id) {
-        run.cancel(id);
-      };
-
-    EmberRenderer.prototype.createChildViewsMorph =
-      function EmberRenderer_createChildViewsMorph(view, _element) {
-        if (view.createChildViewsMorph) {
-          return view.createChildViewsMorph(_element);
-        }
-        var element = _element;
-        if (view.tagName === '') {
-          if (view._morph) {
-            view._childViewsMorph = view._morph;
-          } else {
-            element = document.createDocumentFragment();
-            view._childViewsMorph = this._dom.appendMorph(element);
-          }
-        } else {
-          view._childViewsMorph = this._dom.createMorph(element, element.lastChild, null);
-        }
-        return element;
-      };
-
-    EmberRenderer.prototype.createElement =
-      function EmberRenderer_createElement(view, contextualElement) {
-        // If this is the top-most view, start a new buffer. Otherwise,
-        // create a new buffer relative to the original using the
-        // provided buffer operation (for example, `insertAfter` will
-        // insert a new buffer after the "parent buffer").
-        var tagName = view.tagName;
-        var classNameBindings = view.classNameBindings;
-        var taglessViewWithClassBindings = tagName === '' && classNameBindings.length > 0;
-
-        if (tagName === null || tagName === undefined) {
-          tagName = 'div';
-        }
-
-        
-        var buffer = view.buffer = this.buffer;
-        buffer.reset(tagName, contextualElement);
-
-        if (view.beforeRender) {
-          view.beforeRender(buffer);
-        }
-
-        if (tagName !== '') {
-          if (view.applyAttributesToBuffer) {
-            view.applyAttributesToBuffer(buffer);
-          }
-          buffer.generateElement();
-        }
-
-        if (view.render) {
-          view.render(buffer);
-        }
-
-        if (view.afterRender) {
-          view.afterRender(buffer);
-        }
-
-        var element = buffer.element();
-
-        if (view.isContainer) {
-          this.createChildViewsMorph(view, element);
-        }
-
-        view.buffer = null;
-        if (element && element.nodeType === 1) {
-          // We have hooks, we shouldn't make element observable
-          // consider just doing view.element = element
-          set(view, 'element', element);
-        }
-        return element;
-      };
-
-    EmberRenderer.prototype.destroyView = function destroyView(view) {
-      view.removedFromDOM = true;
-      view.destroy();
-    };
-
-    EmberRenderer.prototype.childViews = function childViews(view) {
-      return view._childViews;
-    };
-
-    Renderer.prototype.willCreateElement = function (view) {
-      if (subscribers.length && view.instrumentDetails) {
-        view._instrumentEnd = _instrumentStart('render.'+view.instrumentName, function viewInstrumentDetails() {
-          var details = {};
-          view.instrumentDetails(details);
-          return details;
-        });
-      }
-      if (view._transitionTo) {
-        view._transitionTo('inBuffer');
-      }
-    }; // inBuffer
-    Renderer.prototype.didCreateElement = function (view) {
-      if (view._transitionTo) {
-        view._transitionTo('hasElement');
-      }
-      if (view._instrumentEnd) {
-        view._instrumentEnd();
-      }
-    }; // hasElement
-    Renderer.prototype.willInsertElement = function (view) {
-      if (view.trigger) { view.trigger('willInsertElement'); }
-    }; // will place into DOM
-    Renderer.prototype.didInsertElement = function (view) {
-      if (view._transitionTo) {
-        view._transitionTo('inDOM');
-      }
-      if (view.trigger) { view.trigger('didInsertElement'); }
-    }; // inDOM // placed into DOM
-
-    Renderer.prototype.willRemoveElement = function (view) {};
-
-    Renderer.prototype.willDestroyElement = function (view) {
-      if (view.trigger) { view.trigger('willDestroyElement'); }
-      if (view.trigger) { view.trigger('willClearRender'); }
-    };
-
-    Renderer.prototype.didDestroyElement = function (view) {
-      set(view, 'element', null);
-      if (view._transitionTo) {
-        view._transitionTo('preRender');
-      }
-    }; // element destroyed so view.destroy shouldn't try to remove it removedFromDOM
-
-    __exports__["default"] = EmberRenderer;
-  });
-enifed("ember-views/system/utils",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
     /**
     @module ember
     @submodule ember-views
     */
 
-    function isSimpleClick(event) {
-      var modifier = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey;
-      var secondaryClick = event.which > 1; // IE9 may return undefined
+    /* BEGIN METAMORPH HELPERS */
+
+    // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
+    // is a "zero-scope" element. This problem can be worked around by making
+    // the first node an invisible text node. We, like Modernizr, use &shy;
+
+    var needsShy = typeof document !== 'undefined' && (function() {
+      var testEl = document.createElement('div');
+      testEl.innerHTML = "<div></div>";
+      testEl.firstChild.innerHTML = "<script></script>";
+      return testEl.firstChild.innerHTML === '';
+    })();
+
+    // IE 8 (and likely earlier) likes to move whitespace preceeding
+    // a script tag to appear after it. This means that we can
+    // accidentally remove whitespace when updating a morph.
+    var movesWhitespace = typeof document !== 'undefined' && (function() {
+      var testEl = document.createElement('div');
+      testEl.innerHTML = "Test: <script type='text/x-placeholder'></script>Value";
+      return testEl.childNodes[0].nodeValue === 'Test:' &&
+              testEl.childNodes[2].nodeValue === ' Value';
+    })();
+
+    // Use this to find children by ID instead of using jQuery
+    var findChildById = function(element, id) {
+      if (element.getAttribute('id') === id) { return element; }
+
+      var len = element.childNodes.length, idx, node, found;
+      for (idx=0; idx<len; idx++) {
+        node = element.childNodes[idx];
+        found = node.nodeType === 1 && findChildById(node, id);
+        if (found) { return found; }
+      }
+    };
+
+    var setInnerHTMLWithoutFix = function(element, html) {
+      if (needsShy) {
+        html = '&shy;' + html;
+      }
+
+      var matches = [];
+      if (movesWhitespace) {
+        // Right now we only check for script tags with ids with the
+        // goal of targeting morphs.
+        html = html.replace(/(\s+)(<script id='([^']+)')/g, function(match, spaces, tag, id) {
+          matches.push([id, spaces]);
+          return tag;
+        });
+      }
+
+      element.innerHTML = html;
+
+      // If we have to do any whitespace adjustments do them now
+      if (matches.length > 0) {
+        var len = matches.length, idx;
+        for (idx=0; idx<len; idx++) {
+          var script = findChildById(element, matches[idx][0]),
+              node = document.createTextNode(matches[idx][1]);
+          script.parentNode.insertBefore(node, script);
+        }
+      }
+
+      if (needsShy) {
+        var shyElement = element.firstChild;
+        while (shyElement.nodeType === 1 && !shyElement.nodeName) {
+          shyElement = shyElement.firstChild;
+        }
+        if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
+          shyElement.nodeValue = shyElement.nodeValue.slice(1);
+        }
+      }
+    };
+
+    /* END METAMORPH HELPERS */
+
+
+    var innerHTMLTags = {};
+    var canSetInnerHTML = function(tagName) {
+      if (innerHTMLTags[tagName] !== undefined) {
+        return innerHTMLTags[tagName];
+      }
+
+      var canSet = true;
+
+      // IE 8 and earlier don't allow us to do innerHTML on select
+      if (tagName.toLowerCase() === 'select') {
+        var el = document.createElement('select');
+        setInnerHTMLWithoutFix(el, '<option value="test">Test</option>');
+        canSet = el.options.length === 1;
+      }
+
+      innerHTMLTags[tagName] = canSet;
+
+      return canSet;
+    };
+
+    function setInnerHTML(element, html) {
+      var tagName = element.tagName;
+
+      if (canSetInnerHTML(tagName)) {
+        setInnerHTMLWithoutFix(element, html);
+      } else {
+        // Firefox versions < 11 do not have support for element.outerHTML.
+        var outerHTML = element.outerHTML || new XMLSerializer().serializeToString(element);
+        
+        var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0],
+            endTag = '</'+tagName+'>';
+
+        var wrapper = document.createElement('div');
+        setInnerHTMLWithoutFix(wrapper, startTag + html + endTag);
+        element = wrapper.firstChild;
+        while (element.tagName !== tagName) {
+          element = element.nextSibling;
+        }
+      }
+
+      return element;
+    }
+
+    __exports__.setInnerHTML = setInnerHTML;function isSimpleClick(event) {
+      var modifier = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey,
+          secondaryClick = event.which > 1; // IE9 may return undefined
 
       return !modifier && !secondaryClick;
     }
 
     __exports__.isSimpleClick = isSimpleClick;
   });
-enifed("ember-views/views/collection_view",
-  ["ember-metal/core","ember-metal/platform","ember-metal/binding","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-views/views/container_view","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-handlebars/ext","ember-runtime/mixins/array","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
+define("ember-views/views/collection_view",
+  ["ember-metal/core","ember-metal/platform","ember-metal/binding","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-views/views/container_view","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-runtime/mixins/array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
 
     /**
@@ -37908,8 +36373,7 @@ enifed("ember-views/views/collection_view",
     var View = __dependency10__["default"];
     var observer = __dependency11__.observer;
     var beforeObserver = __dependency11__.beforeObserver;
-    var handlebarsGetView = __dependency12__.handlebarsGetView;
-    var EmberArray = __dependency13__["default"];
+    var EmberArray = __dependency12__["default"];
 
     /**
       `Ember.CollectionView` is an `Ember.View` descendent responsible for managing
@@ -37932,32 +36396,27 @@ enifed("ember-views/views/collection_view",
       The view for each item in the collection will have its `content` property set
       to the item.
 
-      ## Specifying `itemViewClass`
+      ## Specifying itemViewClass
 
       By default the view class for each item in the managed collection will be an
       instance of `Ember.View`. You can supply a different class by setting the
       `CollectionView`'s `itemViewClass` property.
 
-      Given the following application code:
+      Given an empty `<body>` and the following code:
 
       ```javascript
-      var App = Ember.Application.create();
-      App.ItemListView = Ember.CollectionView.extend({
+      someItemsView = Ember.CollectionView.create({
         classNames: ['a-collection'],
         content: ['A','B','C'],
         itemViewClass: Ember.View.extend({
           template: Ember.Handlebars.compile("the letter: {{view.content}}")
         })
       });
+
+      someItemsView.appendTo('body');
       ```
 
-      And a simple application template:
-
-      ```handlebars
-      {{view 'item-list'}}
-      ```
-
-      The following HTML will result:
+      Will result in the following HTML structure
 
       ```html
       <div class="ember-view a-collection">
@@ -37973,26 +36432,21 @@ enifed("ember-views/views/collection_view",
       "ul", "ol", "table", "thead", "tbody", "tfoot", "tr", or "select" will result
       in the item views receiving an appropriately matched `tagName` property.
 
-      Given the following application code:
+      Given an empty `<body>` and the following code:
 
       ```javascript
-      var App = Ember.Application.create();
-      App.UnorderedListView = Ember.CollectionView.create({
+      anUnorderedListView = Ember.CollectionView.create({
         tagName: 'ul',
         content: ['A','B','C'],
         itemViewClass: Ember.View.extend({
           template: Ember.Handlebars.compile("the letter: {{view.content}}")
         })
       });
+
+      anUnorderedListView.appendTo('body');
       ```
 
-      And a simple application template:
-
-      ```handlebars
-      {{view 'unordered-list-view'}}
-      ```
-
-      The following HTML will result:
+      Will result in the following HTML structure
 
       ```html
       <ul class="ember-view a-collection">
@@ -38003,7 +36457,7 @@ enifed("ember-views/views/collection_view",
       ```
 
       Additional `tagName` pairs can be provided by adding to
-      `Ember.CollectionView.CONTAINER_MAP`. For example:
+      `Ember.CollectionView.CONTAINER_MAP `
 
       ```javascript
       Ember.CollectionView.CONTAINER_MAP['article'] = 'section'
@@ -38016,7 +36470,7 @@ enifed("ember-views/views/collection_view",
       `createChildView` method can be overidden:
 
       ```javascript
-      App.CustomCollectionView = Ember.CollectionView.extend({
+      CustomCollectionView = Ember.CollectionView.extend({
         createChildView: function(viewClass, attrs) {
           if (attrs.content.kind == 'album') {
             viewClass = App.AlbumView;
@@ -38036,23 +36490,18 @@ enifed("ember-views/views/collection_view",
       will be the `CollectionView`s only child.
 
       ```javascript
-      var App = Ember.Application.create();
-      App.ListWithNothing = Ember.CollectionView.create({
-        classNames: ['nothing'],
+      aListWithNothing = Ember.CollectionView.create({
+        classNames: ['nothing']
         content: null,
         emptyView: Ember.View.extend({
           template: Ember.Handlebars.compile("The collection is empty")
         })
       });
+
+      aListWithNothing.appendTo('body');
       ```
 
-      And a simple application template:
-
-      ```handlebars
-      {{view 'list-with-nothing'}}
-      ```
-
-      The following HTML will result:
+      Will result in the following HTML structure
 
       ```html
       <div class="ember-view nothing">
@@ -38209,8 +36658,18 @@ enifed("ember-views/views/collection_view",
         // Loop through child views that correspond with the removed items.
         // Note that we loop from the end of the array to the beginning because
         // we are mutating it as we go.
-        var childViews = this._childViews;
-        var childView, idx;
+        var childViews = this._childViews, childView, idx, len;
+
+        len = this._childViews.length;
+
+        var removingAll = removedCount === len;
+
+        if (removingAll) {
+          this.currentState.empty(this);
+          this.invokeRecursively(function(view) {
+            view.removedFromDOM = true;
+          }, false);
+        }
 
         for (idx = start + removedCount - 1; idx >= start; idx--) {
           childView = childViews[idx];
@@ -38233,15 +36692,19 @@ enifed("ember-views/views/collection_view",
         @param {Number} added number of object added to content
       */
       arrayDidChange: function(content, start, removed, added) {
-        var addedViews = [];
-        var view, item, idx, len, itemViewClass, emptyView;
+        var addedViews = [], view, item, idx, len, itemViewClass,
+          emptyView;
 
         len = content ? get(content, 'length') : 0;
 
         if (len) {
           itemViewClass = get(this, 'itemViewClass');
-          itemViewClass = handlebarsGetView(content, itemViewClass, this.container);
 
+          if ('string' === typeof itemViewClass && isGlobalPath(itemViewClass)) {
+            itemViewClass = get(itemViewClass) || itemViewClass;
+          }
+
+          
           for (idx = start; idx < start+added; idx++) {
             item = content.objectAt(idx);
 
@@ -38325,7 +36788,7 @@ enifed("ember-views/views/collection_view",
 
     __exports__["default"] = CollectionView;
   });
-enifed("ember-views/views/component",
+define("ember-views/views/component",
   ["ember-metal/core","ember-views/mixins/component_template_deprecation","ember-runtime/mixins/target_action_support","ember-views/views/view","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -38475,8 +36938,8 @@ enifed("ember-views/views/component",
       template: computed(function(key, value) {
         if (value !== undefined) { return value; }
 
-        var templateName = get(this, 'templateName');
-        var template = this.templateForName(templateName, 'template');
+        var templateName = get(this, 'templateName'),
+            template = this.templateForName(templateName, 'template');
 
         
         return template || get(this, 'defaultTemplate');
@@ -38500,9 +36963,9 @@ enifed("ember-views/views/component",
       },
 
       _yield: function(context, options) {
-        var view = options.data.view;
-        var parentView = this._parentView;
-        var template = get(this, 'template');
+        var view = options.data.view,
+            parentView = this._parentView,
+            template = get(this, 'template');
 
         if (template) {
           
@@ -38612,8 +37075,8 @@ enifed("ember-views/views/component",
         @param [context] {*} a context to send with the action
       */
       sendAction: function(action) {
-        var actionName;
-        var contexts = a_slice.call(arguments, 1);
+        var actionName,
+            contexts = a_slice.call(arguments, 1);
 
         // Send the default action
         if (action === undefined) {
@@ -38634,9 +37097,9 @@ enifed("ember-views/views/component",
 
     __exports__["default"] = Component;
   });
-enifed("ember-views/views/container_view",
-  ["ember-metal/core","ember-metal/merge","ember-runtime/mixins/mutable_array","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/states","ember-metal/error","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/run_loop","ember-metal/properties","ember-views/system/render_buffer","ember-metal/mixin","ember-runtime/system/native_array","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
+define("ember-views/views/container_view",
+  ["ember-metal/core","ember-metal/merge","ember-runtime/mixins/mutable_array","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/view_collection","ember-views/views/states","ember-metal/error","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/run_loop","ember-metal/properties","ember-views/system/render_buffer","ember-metal/mixin","ember-runtime/system/native_array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert, Ember.K
@@ -38647,21 +37110,22 @@ enifed("ember-views/views/container_view",
     var set = __dependency5__.set;
 
     var View = __dependency6__["default"];
+    var ViewCollection = __dependency7__["default"];
 
-    var cloneStates = __dependency7__.cloneStates;
-    var EmberViewStates = __dependency7__.states;
+    var cloneStates = __dependency8__.cloneStates;
+    var EmberViewStates = __dependency8__.states;
 
-    var EmberError = __dependency8__["default"];
+    var EmberError = __dependency9__["default"];
 
-    var forEach = __dependency9__.forEach;
+    var forEach = __dependency10__.forEach;
 
-    var computed = __dependency10__.computed;
-    var run = __dependency11__["default"];
-    var defineProperty = __dependency12__.defineProperty;
-    var renderBuffer = __dependency13__["default"];
-    var observer = __dependency14__.observer;
-    var beforeObserver = __dependency14__.beforeObserver;
-    var emberA = __dependency15__.A;
+    var computed = __dependency11__.computed;
+    var run = __dependency12__["default"];
+    var defineProperty = __dependency13__.defineProperty;
+    var renderBuffer = __dependency14__["default"];
+    var observer = __dependency15__.observer;
+    var beforeObserver = __dependency15__.beforeObserver;
+    var emberA = __dependency16__.A;
 
     /**
     @module ember
@@ -38821,7 +37285,6 @@ enifed("ember-views/views/container_view",
       @extends Ember.View
     */
     var ContainerView = View.extend(MutableArray, {
-      isContainer: true,
       _states: states,
 
       willWatchProperty: function(prop){
@@ -38895,6 +37358,9 @@ enifed("ember-views/views/container_view",
         @param {Ember.RenderBuffer} buffer the buffer to render to
       */
       render: function(buffer) {
+        this.forEachChildView(function(view) {
+          view.renderToBuffer(buffer);
+        });
       },
 
       instrumentName: 'container',
@@ -39012,40 +37478,69 @@ enifed("ember-views/views/container_view",
       },
 
       ensureChildrenAreInDOM: function(view) {
-        var childViews = view._childViews;
-        var renderer = view._renderer;
+        var childViews = view._childViews, i, len, childView, previous, buffer, viewCollection = new ViewCollection();
 
-        var i, len, childView;
         for (i = 0, len = childViews.length; i < len; i++) {
           childView = childViews[i];
-          if (!childView._elementCreated) {
-            renderer.renderTree(childView, view, i);
+
+          if (!buffer) { buffer = renderBuffer(); buffer._hasElement = false; }
+
+          if (childView.renderToBufferIfNeeded(buffer)) {
+            viewCollection.push(childView);
+          } else if (viewCollection.length) {
+            insertViewCollection(view, viewCollection, previous, buffer);
+            buffer = null;
+            previous = childView;
+            viewCollection.clear();
+          } else {
+            previous = childView;
           }
         }
+
+        if (viewCollection.length) {
+          insertViewCollection(view, viewCollection, previous, buffer);
+        }
       }
     });
 
+    function insertViewCollection(view, viewCollection, previous, buffer) {
+      viewCollection.triggerRecursively('willInsertElement');
+
+      if (previous) {
+        previous.domManager.after(previous, buffer.string());
+      } else {
+        view.domManager.prepend(view, buffer.string());
+      }
+
+      viewCollection.forEach(function(v) {
+        v._transitionTo('inDOM');
+        v.propertyDidChange('element');
+        v.triggerRecursively('didInsertElement');
+      });
+    }
+
+
     __exports__["default"] = ContainerView;
   });
-enifed("ember-views/views/core_view",
-  ["ember-views/system/renderer","ember-views/views/states","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/utils","ember-metal/instrumentation","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+define("ember-views/views/core_view",
+  ["ember-views/views/states","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-metal/property_get","ember-metal/computed","ember-metal/utils","ember-metal/instrumentation","ember-views/system/render_buffer","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
-    var Rerender = __dependency1__["default"];
+    var cloneStates = __dependency1__.cloneStates;
+    var states = __dependency1__.states;
+    var EmberObject = __dependency2__["default"];
+    var Evented = __dependency3__["default"];
+    var ActionHandler = __dependency4__["default"];
 
-    var cloneStates = __dependency2__.cloneStates;
-    var states = __dependency2__.states;
-    var EmberObject = __dependency3__["default"];
-    var Evented = __dependency4__["default"];
-    var ActionHandler = __dependency5__["default"];
+    var get = __dependency5__.get;
+    var computed = __dependency6__.computed;
 
-    var get = __dependency6__.get;
-    var set = __dependency7__.set;
-    var computed = __dependency8__.computed;
+    var typeOf = __dependency7__.typeOf;
 
-    var typeOf = __dependency9__.typeOf;
+    var instrument = __dependency8__.instrument;
 
-    var instrument = __dependency10__.instrument;
+
+    var renderBuffer = __dependency9__["default"];
 
     /**
       `Ember.CoreView` is an abstract class that exists to give view-like behavior
@@ -39064,8 +37559,6 @@ enifed("ember-views/views/core_view",
     */
     var CoreView = EmberObject.extend(Evented, ActionHandler, {
       isView: true,
-      isVirtual: false,
-      isContainer: false,
 
       _states: cloneStates(states),
 
@@ -39111,6 +37604,55 @@ enifed("ember-views/views/core_view",
         hash.view = this;
       },
 
+      /**
+        Invoked by the view system when this view needs to produce an HTML
+        representation. This method will create a new render buffer, if needed,
+        then apply any default attributes, such as class names and visibility.
+        Finally, the `render()` method is invoked, which is responsible for
+        doing the bulk of the rendering.
+
+        You should not need to override this method; instead, implement the
+        `template` property, or if you need more control, override the `render`
+        method.
+
+        @method renderToBuffer
+        @param {Ember.RenderBuffer} buffer the render buffer. If no buffer is
+          passed, a default buffer, using the current view's `tagName`, will
+          be used.
+        @private
+      */
+      renderToBuffer: function(buffer) {
+        var name = 'render.' + this.instrumentName,
+            details = {};
+
+        this.instrumentDetails(details);
+
+        return instrument(name, details, function instrumentRenderToBuffer() {
+          return this._renderToBuffer(buffer);
+        }, this);
+      },
+
+      _renderToBuffer: function(_buffer) {
+        // If this is the top-most view, start a new buffer. Otherwise,
+        // create a new buffer relative to the original using the
+        // provided buffer operation (for example, `insertAfter` will
+        // insert a new buffer after the "parent buffer").
+        var tagName = this.tagName;
+
+        if (tagName === null || tagName === undefined) {
+          tagName = 'div';
+        }
+
+        var buffer = this.buffer = _buffer && _buffer.begin(tagName) || renderBuffer(tagName);
+        this._transitionTo('inBuffer', false);
+
+        this.beforeRender(buffer);
+        this.render(buffer);
+        this.afterRender(buffer);
+
+        return buffer;
+      },
+
       /**
         Override the default event firing from `Ember.Evented` to
         also call methods with the given name.
@@ -39133,6 +37675,16 @@ enifed("ember-views/views/core_view",
         }
       },
 
+      deprecatedSendHandles: function(actionName) {
+        return !!this[actionName];
+      },
+
+      deprecatedSend: function(actionName) {
+        var args = [].slice.call(arguments, 1);
+                        this[actionName].apply(this, args);
+        return;
+      },
+
       has: function(name) {
         return typeOf(this[name]) === 'function' || this._super(name);
       },
@@ -39142,12 +37694,9 @@ enifed("ember-views/views/core_view",
 
         if (!this._super()) { return; }
 
-
         // destroy the element -- this will avoid each child view destroying
         // the element over and over again...
-        if (!this.removedFromDOM && this._renderer) {
-          this._renderer.remove(this, true);
-        }
+        if (!this.removedFromDOM) { this.destroyElement(); }
 
         // remove from parent if found. Don't call removeFromParent,
         // as removeFromParent will try to remove the element from
@@ -39160,17 +37709,15 @@ enifed("ember-views/views/core_view",
       },
 
       clearRenderedChildren: Ember.K,
+      triggerRecursively: Ember.K,
+      invokeRecursively: Ember.K,
       _transitionTo: Ember.K,
       destroyElement: Ember.K
     });
 
-    CoreView.reopenClass({
-      renderer: new Rerender()
-    });
-
     __exports__["default"] = CoreView;
   });
-enifed("ember-views/views/states",
+define("ember-views/views/states",
   ["ember-metal/platform","ember-metal/merge","ember-views/views/states/default","ember-views/views/states/pre_render","ember-views/views/states/in_buffer","ember-views/views/states/has_element","ember-views/views/states/in_dom","ember-views/views/states/destroying","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -39211,7 +37758,7 @@ enifed("ember-views/views/states",
     };
     __exports__.states = states;
   });
-enifed("ember-views/views/states/default",
+define("ember-views/views/states/default",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -39246,16 +37793,23 @@ enifed("ember-views/views/states/default",
       },
 
       destroyElement: function(view) {
-        if (view._renderer)
-          view._renderer.remove(view, false);
+        set(view, 'element', null);
+        if (view._scheduledInsert) {
+          run.cancel(view._scheduledInsert);
+          view._scheduledInsert = null;
+        }
         return view;
       },
 
+      renderToBufferIfNeeded: function () {
+        return false;
+      },
+
       rerender: Ember.K,
       invokeObserver: Ember.K
     };
   });
-enifed("ember-views/views/states/destroying",
+define("ember-views/views/states/destroying",
   ["ember-metal/merge","ember-metal/platform","ember-runtime/system/string","ember-views/views/states/default","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -39282,12 +37836,27 @@ enifed("ember-views/views/states/destroying",
       },
       destroyElement: function() {
         throw new EmberError(fmt(destroyingError, ['destroyElement']));
-      }
+      },
+      empty: function() {
+        throw new EmberError(fmt(destroyingError, ['empty']));
+      },
+
+      setElement: function() {
+        throw new EmberError(fmt(destroyingError, ["set('element', ...)"]));
+      },
+
+      renderToBufferIfNeeded: function() {
+        return false;
+      },
+
+      // Since element insertion is scheduled, don't do anything if
+      // the view has been destroyed between scheduling and execution
+      insertElement: Ember.K
     });
 
     __exports__["default"] = destroying;
   });
-enifed("ember-views/views/states/has_element",
+define("ember-views/views/states/has_element",
   ["ember-views/views/states/default","ember-metal/run_loop","ember-metal/merge","ember-metal/platform","ember-views/system/jquery","ember-metal/error","ember-metal/property_get","ember-metal/property_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -39310,7 +37879,7 @@ enifed("ember-views/views/states/has_element",
 
     merge(hasElement, {
       $: function(view, sel) {
-        var elem = view.get('concreteView').element;
+        var elem = get(view, 'element');
         return sel ? jQuery(sel, elem) : jQuery(elem);
       },
 
@@ -39321,17 +37890,25 @@ enifed("ember-views/views/states/has_element",
         return jQuery("#" + get(view, 'elementId'))[0];
       },
 
+      setElement: function(view, value) {
+        if (value === null) {
+          view._transitionTo('preRender');
+        } else {
+          throw new EmberError("You cannot set an element to a non-null value when the element is already in the DOM.");
+        }
+
+        return value;
+      },
+
       // once the view has been inserted into the DOM, rerendering is
       // deferred to allow bindings to synchronize.
       rerender: function(view) {
-        if (view._root._morph && !view._elementInserted) {
-          throw new EmberError("Something you did caused a view to re-render after it rendered but before it was inserted into the DOM.");
-        }
-        // TODO: should be scheduled with renderer
-        run.scheduleOnce('render', function () {
-          if (view.isDestroying) return;
-          view._renderer.renderTree(view, view._parentView);
-        });
+        view.triggerRecursively('willClearRender');
+
+        view.clearRenderedChildren();
+
+        view.domManager.replace(view);
+        return view;
       },
 
       // once the view is already in the DOM, destroying it removes it
@@ -39339,10 +37916,27 @@ enifed("ember-views/views/states/has_element",
       // preRender state if inDOM.
 
       destroyElement: function(view) {
-        view._renderer.remove(view, false);
+        view._notifyWillDestroyElement();
+        view.domManager.remove(view);
+        set(view, 'element', null);
+        if (view._scheduledInsert) {
+          run.cancel(view._scheduledInsert);
+          view._scheduledInsert = null;
+        }
         return view;
       },
 
+      empty: function(view) {
+        var _childViews = view._childViews, len, idx;
+        if (_childViews) {
+          len = _childViews.length;
+          for (idx = 0; idx < len; idx++) {
+            _childViews[idx]._notifyWillDestroyElement();
+          }
+        }
+        view.domManager.empty(view);
+      },
+
       // Handle events from `Ember.EventDispatcher`
       handleEvent: function(view, eventName, evt) {
         if (view.has(eventName)) {
@@ -39361,7 +37955,7 @@ enifed("ember-views/views/states/has_element",
 
     __exports__["default"] = hasElement;
   });
-enifed("ember-views/views/states/in_buffer",
+define("ember-views/views/states/in_buffer",
   ["ember-views/views/states/default","ember-metal/error","ember-metal/core","ember-metal/platform","ember-metal/merge","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -39400,22 +37994,54 @@ enifed("ember-views/views/states/in_buffer",
       // view will render that view and append the resulting
       // buffer into its buffer.
       appendChild: function(view, childView, options) {
-        var buffer = view.buffer;
-        var _childViews = view._childViews;
+        var buffer = view.buffer, _childViews = view._childViews;
 
         childView = view.createChildView(childView, options);
         if (!_childViews.length) { _childViews = view._childViews = _childViews.slice(); }
         _childViews.push(childView);
 
-        if (!childView._morph) {
-          buffer.pushChildView(childView);
-        }
+        childView.renderToBuffer(buffer);
 
         view.propertyDidChange('childViews');
 
         return childView;
       },
 
+      // when a view is rendered in a buffer, destroying the
+      // element will simply destroy the buffer and put the
+      // state back into the preRender state.
+      destroyElement: function(view) {
+        view.clearBuffer();
+        var viewCollection = view._notifyWillDestroyElement();
+        viewCollection.transitionTo('preRender', false);
+
+        return view;
+      },
+
+      empty: function() {
+              },
+
+      renderToBufferIfNeeded: function (view, buffer) {
+        return false;
+      },
+
+      // It should be impossible for a rendered view to be scheduled for
+      // insertion.
+      insertElement: function() {
+        throw new EmberError("You can't insert an element that has already been rendered");
+      },
+
+      setElement: function(view, value) {
+        if (value === null) {
+          view._transitionTo('preRender');
+        } else {
+          view.clearBuffer();
+          view._transitionTo('hasElement');
+        }
+
+        return value;
+      },
+
       invokeObserver: function(target, observer) {
         observer.call(target);
       }
@@ -39423,7 +38049,7 @@ enifed("ember-views/views/states/in_buffer",
 
     __exports__["default"] = inBuffer;
   });
-enifed("ember-views/views/states/in_dom",
+define("ember-views/views/states/in_dom",
   ["ember-metal/core","ember-metal/platform","ember-metal/merge","ember-metal/error","ember-views/views/states/has_element","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -39462,15 +38088,21 @@ enifed("ember-views/views/states/in_dom",
         if (!View) { View = requireModule('ember-views/views/view')["default"]; } // ES6TODO: this sucks. Have to avoid cycles...
 
         if (!this.isVirtual) delete View.views[view.elementId];
+      },
+
+      insertElement: function(view, fn) {
+        throw new EmberError("You can't insert an element into the DOM that has already been inserted");
       }
     });
 
     __exports__["default"] = inDOM;
   });
-enifed("ember-views/views/states/pre_render",
+define("ember-views/views/states/pre_render",
   ["ember-views/views/states/default","ember-metal/platform","ember-metal/merge","ember-views/system/jquery","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
+    /* global Node */
+
     var _default = __dependency1__["default"];
     var create = __dependency2__.create;
     var merge = __dependency3__["default"];
@@ -39482,10 +38114,44 @@ enifed("ember-views/views/states/pre_render",
     */
     var preRender = create(_default);
 
+    merge(preRender, {
+      // a view leaves the preRender state once its element has been
+      // created (createElement).
+      insertElement: function(view, fn) {
+        view.createElement();
+        var viewCollection = view.viewHierarchyCollection();
+
+        viewCollection.trigger('willInsertElement');
+
+        fn.call(view);
+
+        // We transition to `inDOM` if the element exists in the DOM
+        var element = view.get('element');
+        if (jQuery.contains(document.body, element)) {
+          viewCollection.transitionTo('inDOM', false);
+          viewCollection.trigger('didInsertElement');
+        }
+      },
+
+      renderToBufferIfNeeded: function(view, buffer) {
+        view.renderToBuffer(buffer);
+        return true;
+      },
+
+      empty: Ember.K,
+
+      setElement: function(view, value) {
+        if (value !== null) {
+          view._transitionTo('hasElement');
+        }
+        return value;
+      }
+    });
+
     __exports__["default"] = preRender;
   });
-enifed("ember-views/views/view",
-  ["ember-metal/core","ember-runtime/mixins/evented","ember-runtime/system/object","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/is_none","ember-metal/deprecate_property","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-runtime/copy","ember-metal/binding","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_view","exports"],
+define("ember-views/views/view",
+  ["ember-metal/core","ember-runtime/mixins/evented","ember-runtime/system/object","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/is_none","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-runtime/copy","ember-metal/binding","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_view","ember-views/views/view_collection","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __exports__) {
     "use strict";
     // Ember.assert, Ember.deprecate, Ember.warn, Ember.TEMPLATES,
@@ -39515,36 +38181,47 @@ enifed("ember-views/views/view",
     var isArray = __dependency11__.isArray;
     var isNone = __dependency14__.isNone;
     var Mixin = __dependency13__.Mixin;
-    var deprecateProperty = __dependency15__.deprecateProperty;
-    var emberA = __dependency16__.A;
+    var deprecateProperty = __dependency10__.deprecateProperty;
+    var emberA = __dependency15__.A;
 
-    var dasherize = __dependency17__.dasherize;
+    var dasherize = __dependency16__.dasherize;
 
     // ES6TODO: functions on EnumerableUtils should get their own export
-    var forEach = __dependency18__.forEach;
-    var addObject = __dependency18__.addObject;
-    var removeObject = __dependency18__.removeObject;
+    var forEach = __dependency17__.forEach;
+    var addObject = __dependency17__.addObject;
+    var removeObject = __dependency17__.removeObject;
 
     var beforeObserver = __dependency13__.beforeObserver;
-    var copy = __dependency19__["default"];
-    var isGlobalPath = __dependency20__.isGlobalPath;
+    var copy = __dependency18__["default"];
+    var isGlobalPath = __dependency19__.isGlobalPath;
 
-    var propertyWillChange = __dependency21__.propertyWillChange;
-    var propertyDidChange = __dependency21__.propertyDidChange;
+    var propertyWillChange = __dependency20__.propertyWillChange;
+    var propertyDidChange = __dependency20__.propertyDidChange;
 
-    var jQuery = __dependency22__["default"];
+    var jQuery = __dependency21__["default"];
      // for the side effect of extending Ember.run.queues
 
-    var CoreView = __dependency24__["default"];
+    var CoreView = __dependency23__["default"];
+    var ViewCollection = __dependency24__["default"];
 
     /**
     @module ember
     @submodule ember-views
     */
+
+    var ContainerView;
+
+    function nullViewsBuffer(view) {
+      view.buffer = null;
+
+    }
+
+    function clearCachedElement(view) {
+      meta(view).cache.element = undefined;
+    }
+
     var childViewsProperty = computed(function() {
-      var childViews = this._childViews;
-      var ret = emberA();
-      var view = this;
+      var childViews = this._childViews, ret = emberA(), view = this;
 
       forEach(childViews, function(view) {
         var currentChildViews;
@@ -39558,6 +38235,11 @@ enifed("ember-views/views/view",
       });
 
       ret.replace = function (idx, removedCount, addedViews) {
+        if (!ContainerView) { ContainerView = requireModule('ember-views/views/container_view')['default']; } // ES6TODO: stupid circular dep
+
+        if (view instanceof ContainerView) {
+                    return view.replace(idx, removedCount, addedViews);
+        }
         throw new EmberError("childViews is immutable");
       };
 
@@ -40075,9 +38757,8 @@ enifed("ember-views/views/view",
       on the descendent.
 
       ```javascript
-      var App = Ember.Application.create();
-      App.OuterView = Ember.View.extend({
-        template: Ember.Handlebars.compile("outer {{#view 'inner'}}inner{{/view}} outer"),
+      OuterView = Ember.View.extend({
+        template: Ember.Handlebars.compile("outer {{#view InnerView}}inner{{/view}} outer"),
         eventManager: Ember.Object.create({
           mouseEnter: function(event, view) {
             // view might be instance of either
@@ -40087,7 +38768,7 @@ enifed("ember-views/views/view",
         })
       });
 
-      App.InnerView = Ember.View.extend({
+      InnerView = Ember.View.extend({
         click: function(event) {
           // will be called if rendered inside
           // an OuterView because OuterView's
@@ -40231,8 +38912,8 @@ enifed("ember-views/views/view",
       template: computed('templateName', function(key, value) {
         if (value !== undefined) { return value; }
 
-        var templateName = get(this, 'templateName');
-        var template = this.templateForName(templateName, 'template');
+        var templateName = get(this, 'templateName'),
+            template = this.templateForName(templateName, 'template');
 
         
         return template || get(this, 'defaultTemplate');
@@ -40265,8 +38946,8 @@ enifed("ember-views/views/view",
         @type Function
       */
       layout: computed(function(key) {
-        var layoutName = get(this, 'layoutName');
-        var layout = this.templateForName(layoutName, 'layout');
+        var layoutName = get(this, 'layoutName'),
+            layout = this.templateForName(layoutName, 'layout');
 
         
         return layout || get(this, 'defaultLayout');
@@ -40422,8 +39103,8 @@ enifed("ember-views/views/view",
         @return Ember.View
       */
       nearestOfType: function(klass) {
-        var view = get(this, 'parentView');
-        var isOfType = klass instanceof Mixin ?
+        var view = get(this, 'parentView'),
+            isOfType = klass instanceof Mixin ?
                        function(view) { return klass.detect(view); } :
                        function(view) { return klass.detect(view.constructor); };
 
@@ -40568,6 +39249,21 @@ enifed("ember-views/views/view",
         return this.currentState.rerender(this);
       },
 
+      clearRenderedChildren: function() {
+        var lengthBefore = this.lengthBeforeRender,
+            lengthAfter  = this.lengthAfterRender;
+
+        // If there were child views created during the last call to render(),
+        // remove them under the assumption that they will be re-created when
+        // we re-render.
+
+        // VIEW-TODO: Unit test this path.
+        var childViews = this._childViews;
+        for (var i=lengthAfter-1; i>=lengthBefore; i--) {
+          if (childViews[i]) { childViews[i].destroy(); }
+        }
+      },
+
       /**
         Iterates over the view's `classNameBindings` array, inserts the value
         of the specified property into the `classNames` array, then creates an
@@ -40578,8 +39274,8 @@ enifed("ember-views/views/view",
         @private
       */
       _applyClassNameBindings: function(classBindings) {
-        var classNames = this.classNames;
-        var elem, newClass, dasherizedClass;
+        var classNames = this.classNames,
+        elem, newClass, dasherizedClass;
 
         // Loop through all of the configured bindings. These will be either
         // property names ('isUrgent') or property paths relative to the view
@@ -40657,15 +39353,14 @@ enifed("ember-views/views/view",
         @private
       */
       _applyAttributeBindings: function(buffer, attributeBindings) {
-        var attributeValue;
-        var unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
+        var attributeValue,
+            unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
 
         forEach(attributeBindings, function(binding) {
-          var split = binding.split(':');
-          var property = split[0];
-          var attributeName = split[1] || property;
+          var split = binding.split(':'),
+              property = split[0],
+              attributeName = split[1] || property;
 
-          
           if (property in this) {
             this._setupAttributeBindingObservation(property, attributeName);
 
@@ -40754,7 +39449,13 @@ enifed("ember-views/views/view",
         @property element
         @type DOMElement
       */
-      element: null,
+      element: computed('_parentView', function(key, value) {
+        if (value !== undefined) {
+          return this.currentState.setElement(this, value);
+        } else {
+          return this.currentState.getElement(this);
+        }
+      }),
 
       /**
         Returns a jQuery object for this view's element. If you pass in a selector
@@ -40773,9 +39474,9 @@ enifed("ember-views/views/view",
       },
 
       mutateChildViews: function(callback) {
-        var childViews = this._childViews;
-        var idx = childViews.length;
-        var view;
+        var childViews = this._childViews,
+            idx = childViews.length,
+            view;
 
         while(--idx >= 0) {
           view = childViews[idx];
@@ -40790,8 +39491,8 @@ enifed("ember-views/views/view",
 
         if (!childViews) { return this; }
 
-        var len = childViews.length;
-        var view, idx;
+        var len = childViews.length,
+            view, idx;
 
         for (idx = 0; idx < len; idx++) {
           view = childViews[idx];
@@ -40821,11 +39522,12 @@ enifed("ember-views/views/view",
         @param {String|DOMElement|jQuery} A selector, element, HTML string, or jQuery object
         @return {Ember.View} receiver
       */
-      appendTo: function(selector) {
-        var target = jQuery(selector);
-
-                
-        this.constructor.renderer.appendTo(this, target[0]);
+      appendTo: function(target) {
+        // Schedule the DOM element to be created and appended to the given
+        // element after bindings have synchronized.
+        this._insertElementLater(function() {
+                              this.$().appendTo(target);
+        });
 
         return this;
       },
@@ -40843,15 +39545,47 @@ enifed("ember-views/views/view",
         @param {String|DOMElement|jQuery} target A selector, element, HTML string, or jQuery object
         @return {Ember.View} received
       */
-      replaceIn: function(selector) {
-        var target = jQuery(selector);
-
+      replaceIn: function(target) {
                 
-        this.constructor.renderer.replaceIn(this, target[0]);
+        this._insertElementLater(function() {
+          jQuery(target).empty();
+          this.$().appendTo(target);
+        });
 
         return this;
       },
 
+      /**
+        Schedules a DOM operation to occur during the next render phase. This
+        ensures that all bindings have finished synchronizing before the view is
+        rendered.
+
+        To use, pass a function that performs a DOM operation.
+
+        Before your function is called, this view and all child views will receive
+        the `willInsertElement` event. After your function is invoked, this view
+        and all of its child views will receive the `didInsertElement` event.
+
+        ```javascript
+        view._insertElementLater(function() {
+          this.createElement();
+          this.$().appendTo('body');
+        });
+        ```
+
+        @method _insertElementLater
+        @param {Function} fn the function that inserts the element into the DOM
+        @private
+      */
+      _insertElementLater: function(fn) {
+        this._scheduledInsert = run.scheduleOnce('render', this, '_insertElement', fn);
+      },
+
+      _insertElement: function (fn) {
+        this._scheduledInsert = null;
+        this.currentState.insertElement(this, fn);
+      },
+
       /**
         Appends the view's element to the document body. If the view does
         not have an HTML representation yet, `createElement()` will be called
@@ -40885,6 +39619,9 @@ enifed("ember-views/views/view",
         // In the interim, we will just re-render if that happens. It is more
         // important than elements get garbage collected.
         if (!this.removedFromDOM) { this.destroyElement(); }
+        this.invokeRecursively(function(view) {
+          if (view.clearRenderedChildren) { view.clearRenderedChildren(); }
+        });
       },
 
       elementId: null,
@@ -40906,20 +39643,20 @@ enifed("ember-views/views/view",
       },
 
       /**
-        Creates a DOM representation of the view and all of its child views by
-        recursively calling the `render()` method.
+        Creates a DOM representation of the view and all of its
+        child views by recursively calling the `render()` method.
 
-        After the element has been inserted into the DOM, `didInsertElement` will
+        After the element has been created, `didInsertElement` will
         be called on this view and all of its child views.
 
         @method createElement
         @return {Ember.View} receiver
       */
       createElement: function() {
-        if (this.element) { return this; }
+        if (get(this, 'element')) { return this; }
 
-        this._didCreateElementWithoutMorph = true;
-        this.constructor.renderer.renderTree(this);
+        var buffer = this.renderToBuffer();
+        set(this, 'element', buffer.element());
 
         return this;
       },
@@ -40936,9 +39673,6 @@ enifed("ember-views/views/view",
         or after the view was re-rendered. Override this function to do any
         set up that requires an element in the document body.
 
-        When a view has children, didInsertElement will be called on the
-        child view(s) first, bubbling upwards through the hierarchy.
-
         @event didInsertElement
       */
       didInsertElement: Ember.K,
@@ -40952,6 +39686,65 @@ enifed("ember-views/views/view",
       */
       willClearRender: Ember.K,
 
+      /**
+        Run this callback on the current view (unless includeSelf is false) and recursively on child views.
+
+        @method invokeRecursively
+        @param fn {Function}
+        @param includeSelf {Boolean} Includes itself if true.
+        @private
+      */
+      invokeRecursively: function(fn, includeSelf) {
+        var childViews = (includeSelf === false) ? this._childViews : [this];
+        var currentViews, view, currentChildViews;
+
+        while (childViews.length) {
+          currentViews = childViews.slice();
+          childViews = [];
+
+          for (var i=0, l=currentViews.length; i<l; i++) {
+            view = currentViews[i];
+            currentChildViews = view._childViews ? view._childViews.slice(0) : null;
+            fn(view);
+            if (currentChildViews) {
+              childViews.push.apply(childViews, currentChildViews);
+            }
+          }
+        }
+      },
+
+      triggerRecursively: function(eventName) {
+        var childViews = [this], currentViews, view, currentChildViews;
+
+        while (childViews.length) {
+          currentViews = childViews.slice();
+          childViews = [];
+
+          for (var i=0, l=currentViews.length; i<l; i++) {
+            view = currentViews[i];
+            currentChildViews = view._childViews ? view._childViews.slice(0) : null;
+            if (view.trigger) { view.trigger(eventName); }
+            if (currentChildViews) {
+              childViews.push.apply(childViews, currentChildViews);
+            }
+
+          }
+        }
+      },
+
+      viewHierarchyCollection: function() {
+        var currentView, viewCollection = new ViewCollection([this]);
+
+        for (var i = 0; i < viewCollection.length; i++) {
+          currentView = viewCollection.objectAt(i);
+          if (currentView._childViews) {
+            viewCollection.push.apply(viewCollection, currentView._childViews);
+          }
+        }
+
+        return viewCollection;
+      },
+
       /**
         Destroys any existing element along with the element for any child views
         as well. If the view does not currently have a element, then this method
@@ -40979,13 +39772,40 @@ enifed("ember-views/views/view",
         this function to do any teardown that requires an element, like removing
         event listeners.
 
-        Please note: any property changes made during this event will have no
-        effect on object observers.
-
         @event willDestroyElement
       */
       willDestroyElement: Ember.K,
 
+      /**
+        Triggers the `willDestroyElement` event (which invokes the
+        `willDestroyElement()` method if it exists) on this view and all child
+        views.
+
+        Before triggering `willDestroyElement`, it first triggers the
+        `willClearRender` event recursively.
+
+        @method _notifyWillDestroyElement
+        @private
+      */
+      _notifyWillDestroyElement: function() {
+        var viewCollection = this.viewHierarchyCollection();
+        viewCollection.trigger('willClearRender');
+        viewCollection.trigger('willDestroyElement');
+        return viewCollection;
+      },
+
+      /**
+        If this view's element changes, we need to invalidate the caches of our
+        child views so that we do not retain references to DOM elements that are
+        no longer needed.
+
+        @method _elementDidChange
+        @private
+      */
+      _elementDidChange: observer('element', function() {
+        this.forEachChildView(clearCachedElement);
+      }),
+
       /**
         Called when the parentView property has changed.
 
@@ -41000,9 +39820,26 @@ enifed("ember-views/views/view",
         this._super(hash);
       },
 
-      beforeRender: function(buffer) {},
+      _renderToBuffer: function(buffer) {
+        this.lengthBeforeRender = this._childViews.length;
+        buffer = this._super(buffer);
+        this.lengthAfterRender = this._childViews.length;
 
-      afterRender: function(buffer) {},
+        return buffer;
+      },
+
+      renderToBufferIfNeeded: function (buffer) {
+        return this.currentState.renderToBufferIfNeeded(this, buffer);
+      },
+
+      beforeRender: function(buffer) {
+        this.applyAttributesToBuffer(buffer);
+        buffer.pushOpeningTag();
+      },
+
+      afterRender: function(buffer) {
+        buffer.pushClosingTag();
+      },
 
       applyAttributesToBuffer: function(buffer) {
         // Creates observers for all registered class name and attribute bindings,
@@ -41165,9 +40002,7 @@ enifed("ember-views/views/view",
         @private
       */
       init: function() {
-        if (!this.isVirtual && !this.elementId) {
-          this.elementId = guidFor(this);
-        }
+        this.elementId = this.elementId || guidFor(this);
 
         this._super();
 
@@ -41253,19 +40088,29 @@ enifed("ember-views/views/view",
         @method destroy
       */
       destroy: function() {
-        var childViews = this._childViews;
-        // get parentView before calling super because it'll be destroyed
-        var nonVirtualParentView = get(this, 'parentView');
-        var viewName = this.viewName;
-        var childLen, i;
+        var childViews = this._childViews,
+            // get parentView before calling super because it'll be destroyed
+            nonVirtualParentView = get(this, 'parentView'),
+            viewName = this.viewName,
+            childLen, i;
 
         if (!this._super()) { return; }
 
+        childLen = childViews.length;
+        for (i=childLen-1; i>=0; i--) {
+          childViews[i].removedFromDOM = true;
+        }
+
         // remove from non-virtual parent view if viewName was specified
         if (viewName && nonVirtualParentView) {
           nonVirtualParentView.set(viewName, null);
         }
 
+        childLen = childViews.length;
+        for (i=childLen-1; i>=0; i--) {
+          childViews[i].destroy();
+        }
+
         return this;
       },
 
@@ -41342,18 +40187,16 @@ enifed("ember-views/views/view",
 
       _toggleVisibility: function() {
         var $el = this.$();
+        if (!$el) { return; }
+
         var isVisible = get(this, 'isVisible');
 
         if (this._isVisible === isVisible) { return ; }
 
-        // It's important to keep these in sync, even if we don't yet have
-        // an element in the DOM to manipulate:
-        this._isVisible = isVisible;
-
-        if (!$el) { return; }
-
         $el.toggle(isVisible);
 
+        this._isVisible = isVisible;
+
         if (this._isAncestorHidden()) { return; }
 
         if (isVisible) {
@@ -41397,16 +40240,28 @@ enifed("ember-views/views/view",
 
         return false;
       },
+
+      clearBuffer: function() {
+        this.invokeRecursively(nullViewsBuffer);
+      },
       transitionTo: function(state, children) {
                 this._transitionTo(state, children);
       },
       _transitionTo: function(state, children) {
         var priorState = this.currentState;
         var currentState = this.currentState = this._states[state];
+
         this._state = state;
 
         if (priorState && priorState.exit) { priorState.exit(this); }
         if (currentState.enter) { currentState.enter(this); }
+        if (state === 'inDOM') { meta(this).cache.element = undefined; }
+
+        if (children !== false) {
+          this.forEachChildView(function(view) {
+            view._transitionTo(state);
+          });
+        }
       },
 
       // .......................................................
@@ -41435,13 +40290,13 @@ enifed("ember-views/views/view",
           return;
         }
 
-        var view = this;
-        var stateCheckedObserver = function() {
-          view.currentState.invokeObserver(this, observer);
-        };
-        var scheduledObserver = function() {
-          run.scheduleOnce('render', this, stateCheckedObserver);
-        };
+        var view = this,
+            stateCheckedObserver = function() {
+              view.currentState.invokeObserver(this, observer);
+            },
+            scheduledObserver = function() {
+              run.scheduleOnce('render', this, stateCheckedObserver);
+            };
 
         addObserver(root, path, target, scheduledObserver);
 
@@ -41485,6 +40340,48 @@ enifed("ember-views/views/view",
       run.once(View, 'notifyMutationListeners');
     }
 
+    var DOMManager = {
+      prepend: function(view, html) {
+        view.$().prepend(html);
+        notifyMutationListeners();
+      },
+
+      after: function(view, html) {
+        view.$().after(html);
+        notifyMutationListeners();
+      },
+
+      html: function(view, html) {
+        view.$().html(html);
+        notifyMutationListeners();
+      },
+
+      replace: function(view) {
+        var element = get(view, 'element');
+
+        set(view, 'element', null);
+
+        view._insertElementLater(function() {
+          jQuery(element).replaceWith(get(view, 'element'));
+          notifyMutationListeners();
+        });
+      },
+
+      remove: function(view) {
+        view.$().remove();
+        notifyMutationListeners();
+      },
+
+      empty: function(view) {
+        view.$().empty();
+        notifyMutationListeners();
+      }
+    };
+
+    View.reopen({
+      domManager: DOMManager
+    });
+
     View.reopenClass({
 
       /**
@@ -41507,10 +40404,11 @@ enifed("ember-views/views/view",
         @private
       */
       _parsePropertyPath: function(path) {
-        var split = path.split(':');
-        var propertyPath = split[0];
-        var classNames = "";
-        var className, falsyClassName;
+        var split = path.split(':'),
+            propertyPath = split[0],
+            classNames = "",
+            className,
+            falsyClassName;
 
         // check if the property is defined as prop:class or prop:trueClass:falseClass
         if (split.length > 1) {
@@ -41594,7 +40492,7 @@ enifed("ember-views/views/view",
     });
 
     var mutation = EmberObject.extend(Evented).create();
-    // TODO MOVE TO RENDERER HOOKS
+
     View.addMutationListener = function(callback) {
       mutation.on('change', callback);
     };
@@ -41652,11 +40550,82 @@ enifed("ember-views/views/view",
 
     __exports__["default"] = View;
   });
-enifed("ember",
+define("ember-views/views/view_collection",
+  ["ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var forEach = __dependency1__.forEach;
+
+    function ViewCollection(initialViews) {
+      var views = this.views = initialViews || [];
+      this.length = views.length;
+    }
+
+    ViewCollection.prototype = {
+      length: 0,
+
+      trigger: function(eventName) {
+        var views = this.views, view;
+        for (var i = 0, l = views.length; i < l; i++) {
+          view = views[i];
+          if (view.trigger) { view.trigger(eventName); }
+        }
+      },
+
+      triggerRecursively: function(eventName) {
+        var views = this.views;
+        for (var i = 0, l = views.length; i < l; i++) {
+          views[i].triggerRecursively(eventName);
+        }
+      },
+
+      invokeRecursively: function(fn) {
+        var views = this.views, view;
+
+        for (var i = 0, l = views.length; i < l; i++) {
+          view = views[i];
+          fn(view);
+        }
+      },
+
+      transitionTo: function(state, children) {
+        var views = this.views;
+        for (var i = 0, l = views.length; i < l; i++) {
+          views[i]._transitionTo(state, children);
+        }
+      },
+
+      push: function() {
+        this.length += arguments.length;
+        var views = this.views;
+        return views.push.apply(views, arguments);
+      },
+
+      objectAt: function(idx) {
+        return this.views[idx];
+      },
+
+      forEach: function(callback) {
+        var views = this.views;
+        return forEach(views, callback);
+      },
+
+      clear: function() {
+        this.length = 0;
+        this.views.length = 0;
+      }
+    };
+
+    __exports__["default"] = ViewCollection;
+  });
+define("ember",
   ["ember-metal","ember-runtime","ember-handlebars","ember-views","ember-routing","ember-routing-handlebars","ember-application","ember-extension-support"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
-    "use strict";
-    /* global navigator */
+        // Remove "use strict"; from transpiled module until
+    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+    //
+    // REMOVE_USE_STRICT: true
+
     // require the main entry points for each of these packages
     // this is so that the global exports occur properly
 
@@ -41672,830 +40641,521 @@ enifed("ember",
     @module ember
     */
 
-      });
-enifed("morph",
-  ["./morph/morph","./morph/dom-helper","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
-    "use strict";
-    var Morph = __dependency1__["default"];
-    var Morph;
-    __exports__.Morph = Morph;
-    var DOMHelper = __dependency2__["default"];
-    var DOMHelper;
-    __exports__.DOMHelper = DOMHelper;
+    function throwWithMessage(msg) {
+      return function() {
+        throw new Ember.Error(msg);
+      };
+    }
+
+    function generateRemovedClass(className) {
+      var msg = " has been moved into a plugin: https://github.com/emberjs/ember-states";
+
+      return {
+        extend: throwWithMessage(className + msg),
+        create: throwWithMessage(className + msg)
+      };
+    }
+
+    Ember.StateManager = generateRemovedClass("Ember.StateManager");
+
+    /**
+      This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
+
+      @class StateManager
+      @namespace Ember
+    */
+
+    Ember.State = generateRemovedClass("Ember.State");
+
+    /**
+      This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
+
+      @class State
+      @namespace Ember
+    */
   });
-enifed("morph/dom-helper",
-  ["../morph/morph","./dom-helper/build-html-dom","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+define("metamorph",
+  [],
+  function() {
     "use strict";
-    var Morph = __dependency1__["default"];
-    var buildHTMLDOM = __dependency2__.buildHTMLDOM;
-    var svgNamespace = __dependency2__.svgNamespace;
-    var svgHTMLIntegrationPoints = __dependency2__.svgHTMLIntegrationPoints;
+    // ==========================================================================
+    // Project:   metamorph
+    // Copyright: ©2014 Tilde, Inc. All rights reserved.
+    // ==========================================================================
 
-    var deletesBlankTextNodes = (function(){
-      var element = document.createElement('div');
-      element.appendChild( document.createTextNode('') );
-      var clonedElement = element.cloneNode(true);
-      return clonedElement.childNodes.length === 0;
-    })();
-
-    var ignoresCheckedAttribute = (function(){
-      var element = document.createElement('input');
-      element.setAttribute('checked', 'checked');
-      var clonedElement = element.cloneNode(false);
-      return !clonedElement.checked;
-    })();
-
-    function isSVG(ns){
-      return ns === svgNamespace;
-    }
-
-    // This is not the namespace of the element, but of
-    // the elements inside that elements.
-    function interiorNamespace(element){
-      if (
-        element &&
-        element.namespaceURI === svgNamespace &&
-        !svgHTMLIntegrationPoints[element.tagName]
-      ) {
-        return svgNamespace;
-      } else {
-        return null;
-      }
-    }
-
-    // The HTML spec allows for "omitted start tags". These tags are optional
-    // when their intended child is the first thing in the parent tag. For
-    // example, this is a tbody start tag:
-    //
-    // <table>
-    //   <tbody>
-    //     <tr>
-    //
-    // The tbody may be omitted, and the browser will accept and render:
-    //
-    // <table>
-    //   <tr>
-    //
-    // However, the omitted start tag will still be added to the DOM. Here
-    // we test the string and context to see if the browser is about to
-    // perform this cleanup.
-    //
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags
-    // describes which tags are omittable. The spec for tbody and colgroup
-    // explains this behavior:
-    //
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-tbody-element
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-colgroup-element
-    //
-
-    var omittedStartTagChildTest = /<([\w:]+)/;
-    function detectOmittedStartTag(string, contextualElement){
-      // Omitted start tags are only inside table tags.
-      if (contextualElement.tagName === 'TABLE') {
-        var omittedStartTagChildMatch = omittedStartTagChildTest.exec(string);
-        if (omittedStartTagChildMatch) {
-          var omittedStartTagChild = omittedStartTagChildMatch[1];
-          // It is already asserted that the contextual element is a table
-          // and not the proper start tag. Just see if a tag was omitted.
-          return omittedStartTagChild === 'tr' ||
-                 omittedStartTagChild === 'col';
-        }
-      }
-    }
-
-    function buildSVGDOM(html, dom){
-      var div = dom.document.createElement('div');
-      div.innerHTML = '<svg>'+html+'</svg>';
-      return div.firstChild.childNodes;
-    }
-
-    /*
-     * A class wrapping DOM functions to address environment compatibility,
-     * namespaces, contextual elements for morph un-escaped content
-     * insertion.
-     *
-     * When entering a template, a DOMHelper should be passed:
-     *
-     *   template(context, { hooks: hooks, dom: new DOMHelper() });
-     *
-     * TODO: support foreignObject as a passed contextual element. It has
-     * a namespace (svg) that does not match its internal namespace
-     * (xhtml).
-     *
-     * @class DOMHelper
-     * @constructor
-     * @param {HTMLDocument} _document The document DOM methods are proxied to
-     */
-    function DOMHelper(_document){
-      this.document = _document || window.document;
-      this.namespace = null;
-    }
-
-    var prototype = DOMHelper.prototype;
-    prototype.constructor = DOMHelper;
-
-    prototype.insertBefore = function(element, childElement, referenceChild) {
-      return element.insertBefore(childElement, referenceChild);
-    };
-
-    prototype.appendChild = function(element, childElement) {
-      return element.appendChild(childElement);
-    };
-
-    prototype.appendText = function(element, text) {
-      return element.appendChild(this.document.createTextNode(text));
-    };
-
-    prototype.setAttribute = function(element, name, value) {
-      element.setAttribute(name, value);
-    };
-
-    if (document.createElementNS) {
-      // Only opt into namespace detection if a contextualElement
-      // is passed.
-      prototype.createElement = function(tagName, contextualElement) {
-        var namespace = this.namespace;
-        if (contextualElement) {
-          if (tagName === 'svg') {
-            namespace = svgNamespace;
+    var K = function() {},
+        guid = 0,
+        disableRange = (function(){
+          if ('undefined' !== typeof MetamorphENV) {
+            return MetamorphENV.DISABLE_RANGE_API;
+          } else if ('undefined' !== ENV) {
+            return ENV.DISABLE_RANGE_API;
           } else {
-            namespace = interiorNamespace(contextualElement);
+            return false;
           }
-        }
-        if (namespace) {
-          return this.document.createElementNS(namespace, tagName);
+        })(),
+
+        // Feature-detect the W3C range API, the extended check is for IE9 which only partially supports ranges
+        supportsRange = (!disableRange) && typeof document !== 'undefined' && ('createRange' in document) && (typeof Range !== 'undefined') && Range.prototype.createContextualFragment,
+
+        // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
+        // is a "zero-scope" element. This problem can be worked around by making
+        // the first node an invisible text node. We, like Modernizr, use &shy;
+        needsShy = typeof document !== 'undefined' && (function() {
+          var testEl = document.createElement('div');
+          testEl.innerHTML = "<div></div>";
+          testEl.firstChild.innerHTML = "<script></script>";
+          return testEl.firstChild.innerHTML === '';
+        })(),
+
+
+        // IE 8 (and likely earlier) likes to move whitespace preceeding
+        // a script tag to appear after it. This means that we can
+        // accidentally remove whitespace when updating a morph.
+        movesWhitespace = document && (function() {
+          var testEl = document.createElement('div');
+          testEl.innerHTML = "Test: <script type='text/x-placeholder'></script>Value";
+          return testEl.childNodes[0].nodeValue === 'Test:' &&
+                  testEl.childNodes[2].nodeValue === ' Value';
+        })();
+
+    // Constructor that supports either Metamorph('foo') or new
+    // Metamorph('foo');
+    //
+    // Takes a string of HTML as the argument.
+
+    var Metamorph = function(html) {
+      var self;
+
+      if (this instanceof Metamorph) {
+        self = this;
+      } else {
+        self = new K();
+      }
+
+      self.innerHTML = html;
+      var myGuid = 'metamorph-'+(guid++);
+      self.start = myGuid + '-start';
+      self.end = myGuid + '-end';
+
+      return self;
+    };
+
+    K.prototype = Metamorph.prototype;
+
+    var rangeFor, htmlFunc, removeFunc, outerHTMLFunc, appendToFunc, afterFunc, prependFunc, startTagFunc, endTagFunc;
+
+    outerHTMLFunc = function() {
+      return this.startTag() + this.innerHTML + this.endTag();
+    };
+
+    startTagFunc = function() {
+      /*
+       * We replace chevron by its hex code in order to prevent escaping problems.
+       * Check this thread for more explaination:
+       * http://stackoverflow.com/questions/8231048/why-use-x3c-instead-of-when-generating-html-from-javascript
+       */
+      return "<script id='" + this.start + "' type='text/x-placeholder'>\x3C/script>";
+    };
+
+    endTagFunc = function() {
+      /*
+       * We replace chevron by its hex code in order to prevent escaping problems.
+       * Check this thread for more explaination:
+       * http://stackoverflow.com/questions/8231048/why-use-x3c-instead-of-when-generating-html-from-javascript
+       */
+      return "<script id='" + this.end + "' type='text/x-placeholder'>\x3C/script>";
+    };
+
+    // If we have the W3C range API, this process is relatively straight forward.
+    if (supportsRange) {
+
+      // Get a range for the current morph. Optionally include the starting and
+      // ending placeholders.
+      rangeFor = function(morph, outerToo) {
+        var range = document.createRange();
+        var before = document.getElementById(morph.start);
+        var after = document.getElementById(morph.end);
+
+        if (outerToo) {
+          range.setStartBefore(before);
+          range.setEndAfter(after);
         } else {
-          return this.document.createElement(tagName);
+          range.setStartAfter(before);
+          range.setEndBefore(after);
+        }
+
+        return range;
+      };
+
+      htmlFunc = function(html, outerToo) {
+        // get a range for the current metamorph object
+        var range = rangeFor(this, outerToo);
+
+        // delete the contents of the range, which will be the
+        // nodes between the starting and ending placeholder.
+        range.deleteContents();
+
+        // create a new document fragment for the HTML
+        var fragment = range.createContextualFragment(html);
+
+        // insert the fragment into the range
+        range.insertNode(fragment);
+      };
+
+      /**
+      * @public
+      *
+      * Remove this object (including starting and ending
+      * placeholders).
+      *
+      * @method remove
+      */
+      removeFunc = function() {
+        // get a range for the current metamorph object including
+        // the starting and ending placeholders.
+        var range = rangeFor(this, true);
+
+        // delete the entire range.
+        range.deleteContents();
+      };
+
+      appendToFunc = function(node) {
+        var range = document.createRange();
+        range.setStart(node);
+        range.collapse(false);
+        var frag = range.createContextualFragment(this.outerHTML());
+        node.appendChild(frag);
+      };
+
+      afterFunc = function(html) {
+        var range = document.createRange();
+        var after = document.getElementById(this.end);
+
+        range.setStartAfter(after);
+        range.setEndAfter(after);
+
+        var fragment = range.createContextualFragment(html);
+        range.insertNode(fragment);
+      };
+
+      prependFunc = function(html) {
+        var range = document.createRange();
+        var start = document.getElementById(this.start);
+
+        range.setStartAfter(start);
+        range.setEndAfter(start);
+
+        var fragment = range.createContextualFragment(html);
+        range.insertNode(fragment);
+      };
+
+    } else {
+      /*
+       * This code is mostly taken from jQuery, with one exception. In jQuery's case, we
+       * have some HTML and we need to figure out how to convert it into some nodes.
+       *
+       * In this case, jQuery needs to scan the HTML looking for an opening tag and use
+       * that as the key for the wrap map. In our case, we know the parent node, and
+       * can use its type as the key for the wrap map.
+       **/
+      Metamorph._wrapMap = {
+        select: [ 1, "<select multiple='multiple'>", "</select>" ],
+        fieldset: [ 1, "<fieldset>", "</fieldset>" ],
+        table: [ 1, "<table>", "</table>" ],
+        tbody: [ 2, "<table><tbody>", "</tbody></table>" ],
+        tr: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+        colgroup: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+        map: [ 1, "<map>", "</map>" ],
+        _default: [ 0, "", "" ]
+      };
+
+      var findChildById = function(element, id) {
+        if (element.getAttribute('id') === id) { return element; }
+
+        var len = element.childNodes.length, idx, node, found;
+        for (idx=0; idx<len; idx++) {
+          node = element.childNodes[idx];
+          found = node.nodeType === 1 && findChildById(node, id);
+          if (found) { return found; }
         }
       };
-    } else {
-      prototype.createElement = function(tagName) {
-        return this.document.createElement(tagName);
+
+      var setInnerHTML = function(element, html) {
+        var matches = [];
+        if (movesWhitespace) {
+          // Right now we only check for script tags with ids with the
+          // goal of targeting morphs.
+          html = html.replace(/(\s+)(<script id='([^']+)')/g, function(match, spaces, tag, id) {
+            matches.push([id, spaces]);
+            return tag;
+          });
+        }
+
+        element.innerHTML = html;
+
+        // If we have to do any whitespace adjustments do them now
+        if (matches.length > 0) {
+          var len = matches.length, idx;
+          for (idx=0; idx<len; idx++) {
+            var script = findChildById(element, matches[idx][0]),
+                node = document.createTextNode(matches[idx][1]);
+            script.parentNode.insertBefore(node, script);
+          }
+        }
+      };
+
+      /*
+       * Given a parent node and some HTML, generate a set of nodes. Return the first
+       * node, which will allow us to traverse the rest using nextSibling.
+       *
+       * We need to do this because innerHTML in IE does not really parse the nodes.
+       */
+      var firstNodeFor = function(parentNode, html) {
+        var wrapMap = Metamorph._wrapMap;
+        var arr = wrapMap[parentNode.tagName.toLowerCase()] || wrapMap._default;
+        var depth = arr[0], start = arr[1], end = arr[2];
+
+        if (needsShy) { html = '&shy;'+html; }
+
+        var element = document.createElement('div');
+
+        setInnerHTML(element, start + html + end);
+
+        for (var i=0; i<=depth; i++) {
+          element = element.firstChild;
+        }
+
+        // Look for &shy; to remove it.
+        if (needsShy) {
+          var shyElement = element;
+
+          // Sometimes we get nameless elements with the shy inside
+          while (shyElement.nodeType === 1 && !shyElement.nodeName) {
+            shyElement = shyElement.firstChild;
+          }
+
+          // At this point it's the actual unicode character.
+          if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
+            shyElement.nodeValue = shyElement.nodeValue.slice(1);
+          }
+        }
+
+        return element;
+      };
+
+      /*
+       * In some cases, Internet Explorer can create an anonymous node in
+       * the hierarchy with no tagName. You can create this scenario via:
+       *
+       *     div = document.createElement("div");
+       *     div.innerHTML = "<table>&shy<script></script><tr><td>hi</td></tr></table>";
+       *     div.firstChild.firstChild.tagName //=> ""
+       *
+       * If our script markers are inside such a node, we need to find that
+       * node and use *it* as the marker.
+       */
+      var realNode = function(start) {
+        while (start.parentNode.tagName === "") {
+          start = start.parentNode;
+        }
+
+        return start;
+      };
+
+      /*
+       * When automatically adding a tbody, Internet Explorer inserts the
+       * tbody immediately before the first <tr>. Other browsers create it
+       * before the first node, no matter what.
+       *
+       * This means the the following code:
+       *
+       *     div = document.createElement("div");
+       *     div.innerHTML = "<table><script id='first'></script><tr><td>hi</td></tr><script id='last'></script></table>
+       *
+       * Generates the following DOM in IE:
+       *
+       *     + div
+       *       + table
+       *         - script id='first'
+       *         + tbody
+       *           + tr
+       *             + td
+       *               - "hi"
+       *           - script id='last'
+       *
+       * Which means that the two script tags, even though they were
+       * inserted at the same point in the hierarchy in the original
+       * HTML, now have different parents.
+       *
+       * This code reparents the first script tag by making it the tbody's
+       * first child.
+       *
+       */
+      var fixParentage = function(start, end) {
+        if (start.parentNode !== end.parentNode) {
+          end.parentNode.insertBefore(start, end.parentNode.firstChild);
+        }
+      };
+
+      htmlFunc = function(html, outerToo) {
+        // get the real starting node. see realNode for details.
+        var start = realNode(document.getElementById(this.start));
+        var end = document.getElementById(this.end);
+        var parentNode = end.parentNode;
+        var node, nextSibling, last;
+
+        // make sure that the start and end nodes share the same
+        // parent. If not, fix it.
+        fixParentage(start, end);
+
+        // remove all of the nodes after the starting placeholder and
+        // before the ending placeholder.
+        node = start.nextSibling;
+        while (node) {
+          nextSibling = node.nextSibling;
+          last = node === end;
+
+          // if this is the last node, and we want to remove it as well,
+          // set the `end` node to the next sibling. This is because
+          // for the rest of the function, we insert the new nodes
+          // before the end (note that insertBefore(node, null) is
+          // the same as appendChild(node)).
+          //
+          // if we do not want to remove it, just break.
+          if (last) {
+            if (outerToo) { end = node.nextSibling; } else { break; }
+          }
+
+          node.parentNode.removeChild(node);
+
+          // if this is the last node and we didn't break before
+          // (because we wanted to remove the outer nodes), break
+          // now.
+          if (last) { break; }
+
+          node = nextSibling;
+        }
+
+        // get the first node for the HTML string, even in cases like
+        // tables and lists where a simple innerHTML on a div would
+        // swallow some of the content.
+        node = firstNodeFor(start.parentNode, html);
+
+        if (outerToo) {
+          start.parentNode.removeChild(start);
+        }
+
+        // copy the nodes for the HTML between the starting and ending
+        // placeholder.
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.insertBefore(node, end);
+          node = nextSibling;
+        }
+      };
+
+      // remove the nodes in the DOM representing this metamorph.
+      //
+      // this includes the starting and ending placeholders.
+      removeFunc = function() {
+        var start = realNode(document.getElementById(this.start));
+        var end = document.getElementById(this.end);
+
+        this.html('');
+        start.parentNode.removeChild(start);
+        end.parentNode.removeChild(end);
+      };
+
+      appendToFunc = function(parentNode) {
+        var node = firstNodeFor(parentNode, this.outerHTML());
+        var nextSibling;
+
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.appendChild(node);
+          node = nextSibling;
+        }
+      };
+
+      afterFunc = function(html) {
+        // get the real starting node. see realNode for details.
+        var end = document.getElementById(this.end);
+        var insertBefore = end.nextSibling;
+        var parentNode = end.parentNode;
+        var nextSibling;
+        var node;
+
+        // get the first node for the HTML string, even in cases like
+        // tables and lists where a simple innerHTML on a div would
+        // swallow some of the content.
+        node = firstNodeFor(parentNode, html);
+
+        // copy the nodes for the HTML between the starting and ending
+        // placeholder.
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.insertBefore(node, insertBefore);
+          node = nextSibling;
+        }
+      };
+
+      prependFunc = function(html) {
+        var start = document.getElementById(this.start);
+        var parentNode = start.parentNode;
+        var nextSibling;
+        var node;
+
+        node = firstNodeFor(parentNode, html);
+        var insertBefore = start.nextSibling;
+
+        while (node) {
+          nextSibling = node.nextSibling;
+          parentNode.insertBefore(node, insertBefore);
+          node = nextSibling;
+        }
       };
     }
 
-    prototype.setNamespace = function(ns) {
-      this.namespace = ns;
+    Metamorph.prototype.html = function(html) {
+      this.checkRemoved();
+      if (html === undefined) { return this.innerHTML; }
+
+      htmlFunc.call(this, html);
+
+      this.innerHTML = html;
     };
 
-    prototype.detectNamespace = function(element) {
-      this.namespace = interiorNamespace(element);
+    Metamorph.prototype.replaceWith = function(html) {
+      this.checkRemoved();
+      htmlFunc.call(this, html, true);
     };
 
-    prototype.createDocumentFragment = function(){
-      return this.document.createDocumentFragment();
+    Metamorph.prototype.remove = removeFunc;
+    Metamorph.prototype.outerHTML = outerHTMLFunc;
+    Metamorph.prototype.appendTo = appendToFunc;
+    Metamorph.prototype.after = afterFunc;
+    Metamorph.prototype.prepend = prependFunc;
+    Metamorph.prototype.startTag = startTagFunc;
+    Metamorph.prototype.endTag = endTagFunc;
+
+    Metamorph.prototype.isRemoved = function() {
+      var before = document.getElementById(this.start);
+      var after = document.getElementById(this.end);
+
+      return !before || !after;
     };
 
-    prototype.createTextNode = function(text){
-      return this.document.createTextNode(text);
-    };
-
-    prototype.repairClonedNode = function(element, blankChildTextNodes, isChecked){
-      if (deletesBlankTextNodes && blankChildTextNodes.length > 0) {
-        for (var i=0, len=blankChildTextNodes.length;i<len;i++){
-          var textNode = this.document.createTextNode(''),
-              offset = blankChildTextNodes[i],
-              before = element.childNodes[offset];
-          if (before) {
-            element.insertBefore(textNode, before);
-          } else {
-            element.appendChild(textNode);
-          }
-        }
-      }
-      if (ignoresCheckedAttribute && isChecked) {
-        element.setAttribute('checked', 'checked');
+    Metamorph.prototype.checkRemoved = function() {
+      if (this.isRemoved()) {
+        throw new Error("Cannot perform operations on a Metamorph that is not in the DOM.");
       }
     };
 
-    prototype.cloneNode = function(element, deep){
-      var clone = element.cloneNode(!!deep);
-      return clone;
-    };
-
-    prototype.createMorph = function(parent, start, end, contextualElement){
-      if (!contextualElement && parent.nodeType === 1) {
-        contextualElement = parent;
-      }
-      return new Morph(parent, start, end, this, contextualElement);
-    };
-
-    // This helper is just to keep the templates good looking,
-    // passing integers instead of element references.
-    prototype.createMorphAt = function(parent, startIndex, endIndex, contextualElement){
-      var childNodes = parent.childNodes,
-          start = startIndex === -1 ? null : childNodes[startIndex],
-          end = endIndex === -1 ? null : childNodes[endIndex];
-      return this.createMorph(parent, start, end, contextualElement);
-    };
-
-    prototype.insertMorphBefore = function(element, referenceChild, contextualElement) {
-      var start = this.document.createTextNode('');
-      var end = this.document.createTextNode('');
-      element.insertBefore(start, referenceChild);
-      element.insertBefore(end, referenceChild);
-      return this.createMorph(element, start, end, contextualElement);
-    };
-
-    prototype.appendMorph = function(element, contextualElement) {
-      var start = this.document.createTextNode('');
-      var end = this.document.createTextNode('');
-      element.appendChild(start);
-      element.appendChild(end);
-      return this.createMorph(element, start, end, contextualElement);
-    };
-
-    prototype.parseHTML = function(html, contextualElement) {
-      var isSVGContent = (
-        isSVG(this.namespace) &&
-        !svgHTMLIntegrationPoints[contextualElement.tagName]
-      );
-
-      if (isSVGContent) {
-        return buildSVGDOM(html, this);
-      } else {
-        var nodes = buildHTMLDOM(html, contextualElement, this);
-        if (detectOmittedStartTag(html, contextualElement)) {
-          var node = nodes[0];
-          while (node && node.nodeType !== 1) {
-            node = node.nextSibling;
-          }
-          return node.childNodes;
-        } else {
-          return nodes;
-        }
-      }
-    };
-
-    __exports__["default"] = DOMHelper;
+    return Metamorph;
   });
-enifed("morph/dom-helper/build-html-dom",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    var svgHTMLIntegrationPoints = {foreignObject: 1, desc: 1, title: 1};
-    __exports__.svgHTMLIntegrationPoints = svgHTMLIntegrationPoints;var svgNamespace = 'http://www.w3.org/2000/svg';
-    __exports__.svgNamespace = svgNamespace;
-    // Safari does not like using innerHTML on SVG HTML integration
-    // points (desc/title/foreignObject).
-    var needsIntegrationPointFix = document && document.createElementNS && (function() {
-      // In FF title will not accept innerHTML.
-      var testEl = document.createElementNS(svgNamespace, 'title');
-      testEl.innerHTML = "<div></div>";
-      return testEl.childNodes.length === 0 || testEl.childNodes[0].nodeType !== 1;
-    })();
 
-    // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
-    // is a "zero-scope" element. This problem can be worked around by making
-    // the first node an invisible text node. We, like Modernizr, use &shy;
-    var needsShy = document && (function() {
-      var testEl = document.createElement('div');
-      testEl.innerHTML = "<div></div>";
-      testEl.firstChild.innerHTML = "<script><\/script>";
-      return testEl.firstChild.innerHTML === '';
-    })();
-
-    // IE 8 (and likely earlier) likes to move whitespace preceeding
-    // a script tag to appear after it. This means that we can
-    // accidentally remove whitespace when updating a morph.
-    var movesWhitespace = document && (function() {
-      var testEl = document.createElement('div');
-      testEl.innerHTML = "Test: <script type='text/x-placeholder'><\/script>Value";
-      return testEl.childNodes[0].nodeValue === 'Test:' &&
-              testEl.childNodes[2].nodeValue === ' Value';
-    })();
-
-    // IE8 create a selected attribute where they should only
-    // create a property
-    var createsSelectedAttribute = document && (function() {
-      var testEl = document.createElement('div');
-      testEl.innerHTML = "<select><option></option></select>";
-      return testEl.childNodes[0].childNodes[0].getAttribute('selected') === 'selected';
-    })();
-
-    var detectAutoSelectedOption;
-    if (createsSelectedAttribute) {
-      var detectAutoSelectedOptionRegex = /<option[^>]*selected/;
-      detectAutoSelectedOption = function detectAutoSelectedOption(select, option, html) { //jshint ignore:line
-        return select.selectedIndex === 0 &&
-               !detectAutoSelectedOptionRegex.test(html);
-      };
-    } else {
-      detectAutoSelectedOption = function detectAutoSelectedOption(select, option, html) { //jshint ignore:line
-        var selectedAttribute = option.getAttribute('selected');
-        return select.selectedIndex === 0 && (
-                 selectedAttribute === null ||
-                 ( selectedAttribute !== '' && selectedAttribute.toLowerCase() !== 'selected' )
-                );
-      };
-    }
-
-    // IE 9 and earlier don't allow us to set innerHTML on col, colgroup, frameset,
-    // html, style, table, tbody, tfoot, thead, title, tr. Detect this and add
-    // them to an initial list of corrected tags.
-    //
-    // Here we are only dealing with the ones which can have child nodes.
-    //
-    var tagNamesRequiringInnerHTMLFix, tableNeedsInnerHTMLFix;
-    var tableInnerHTMLTestElement = document.createElement('table');
-    try {
-      tableInnerHTMLTestElement.innerHTML = '<tbody></tbody>';
-    } catch (e) {
-    } finally {
-      tableNeedsInnerHTMLFix = (tableInnerHTMLTestElement.childNodes.length === 0);
-    }
-    if (tableNeedsInnerHTMLFix) {
-      tagNamesRequiringInnerHTMLFix = {
-        colgroup: ['table'],
-        table: [],
-        tbody: ['table'],
-        tfoot: ['table'],
-        thead: ['table'],
-        tr: ['table', 'tbody']
-      };
-    }
-
-    // IE 8 doesn't allow setting innerHTML on a select tag. Detect this and
-    // add it to the list of corrected tags.
-    //
-    var selectInnerHTMLTestElement = document.createElement('select');
-    selectInnerHTMLTestElement.innerHTML = '<option></option>';
-    if (selectInnerHTMLTestElement) {
-      tagNamesRequiringInnerHTMLFix = tagNamesRequiringInnerHTMLFix || {};
-      tagNamesRequiringInnerHTMLFix.select = [];
-    }
-
-    function scriptSafeInnerHTML(element, html) {
-      // without a leading text node, IE will drop a leading script tag.
-      html = '&shy;'+html;
-
-      element.innerHTML = html;
-
-      var nodes = element.childNodes;
-
-      // Look for &shy; to remove it.
-      var shyElement = nodes[0];
-      while (shyElement.nodeType === 1 && !shyElement.nodeName) {
-        shyElement = shyElement.firstChild;
-      }
-      // At this point it's the actual unicode character.
-      if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
-        var newValue = shyElement.nodeValue.slice(1);
-        if (newValue.length) {
-          shyElement.nodeValue = shyElement.nodeValue.slice(1);
-        } else {
-          shyElement.parentNode.removeChild(shyElement);
-        }
-      }
-
-      return nodes;
-    }
-
-    function buildDOMWithFix(html, contextualElement){
-      var tagName = contextualElement.tagName;
-
-      // Firefox versions < 11 do not have support for element.outerHTML.
-      var outerHTML = contextualElement.outerHTML || new XMLSerializer().serializeToString(contextualElement);
-      if (!outerHTML) {
-        throw "Can't set innerHTML on "+tagName+" in this browser";
-      }
-
-      var wrappingTags = tagNamesRequiringInnerHTMLFix[tagName.toLowerCase()];
-      var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0];
-      var endTag = '</'+tagName+'>';
-
-      var wrappedHTML = [startTag, html, endTag];
-
-      var i = wrappingTags.length;
-      var wrappedDepth = 1 + i;
-      while(i--) {
-        wrappedHTML.unshift('<'+wrappingTags[i]+'>');
-        wrappedHTML.push('</'+wrappingTags[i]+'>');
-      }
-
-      var wrapper = document.createElement('div');
-      scriptSafeInnerHTML(wrapper, wrappedHTML.join(''));
-      var element = wrapper;
-      while (wrappedDepth--) {
-        element = element.firstChild;
-        while (element && element.nodeType !== 1) {
-          element = element.nextSibling;
-        }
-      }
-      while (element && element.tagName !== tagName) {
-        element = element.nextSibling;
-      }
-      return element ? element.childNodes : [];
-    }
-
-    var buildDOM;
-    if (needsShy) {
-      buildDOM = function buildDOM(html, contextualElement, dom){
-        contextualElement = dom.cloneNode(contextualElement, false);
-        scriptSafeInnerHTML(contextualElement, html);
-        return contextualElement.childNodes;
-      };
-    } else {
-      buildDOM = function buildDOM(html, contextualElement, dom){
-        contextualElement = dom.cloneNode(contextualElement, false);
-        contextualElement.innerHTML = html;
-        return contextualElement.childNodes;
-      };
-    }
-
-    var buildIESafeDOM;
-    if (tagNamesRequiringInnerHTMLFix || movesWhitespace) {
-      buildIESafeDOM = function buildIESafeDOM(html, contextualElement, dom) {
-        // Make a list of the leading text on script nodes. Include
-        // script tags without any whitespace for easier processing later.
-        var spacesBefore = [];
-        var spacesAfter = [];
-        html = html.replace(/(\s*)(<script)/g, function(match, spaces, tag) {
-          spacesBefore.push(spaces);
-          return tag;
-        });
-
-        html = html.replace(/(<\/script>)(\s*)/g, function(match, tag, spaces) {
-          spacesAfter.push(spaces);
-          return tag;
-        });
-
-        // Fetch nodes
-        var nodes;
-        if (tagNamesRequiringInnerHTMLFix[contextualElement.tagName.toLowerCase()]) {
-          // buildDOMWithFix uses string wrappers for problematic innerHTML.
-          nodes = buildDOMWithFix(html, contextualElement);
-        } else {
-          nodes = buildDOM(html, contextualElement, dom);
-        }
-
-        // Build a list of script tags, the nodes themselves will be
-        // mutated as we add test nodes.
-        var i, j, node, nodeScriptNodes;
-        var scriptNodes = [];
-        for (i=0;node=nodes[i];i++) {
-          if (node.nodeType !== 1) {
-            continue;
-          }
-          if (node.tagName === 'SCRIPT') {
-            scriptNodes.push(node);
-          } else {
-            nodeScriptNodes = node.getElementsByTagName('script');
-            for (j=0;j<nodeScriptNodes.length;j++) {
-              scriptNodes.push(nodeScriptNodes[j]);
-            }
-          }
-        }
-
-        // Walk the script tags and put back their leading text nodes.
-        var scriptNode, textNode, spaceBefore, spaceAfter;
-        for (i=0;scriptNode=scriptNodes[i];i++) {
-          spaceBefore = spacesBefore[i];
-          if (spaceBefore && spaceBefore.length > 0) {
-            textNode = dom.document.createTextNode(spaceBefore);
-            scriptNode.parentNode.insertBefore(textNode, scriptNode);
-          }
-
-          spaceAfter = spacesAfter[i];
-          if (spaceAfter && spaceAfter.length > 0) {
-            textNode = dom.document.createTextNode(spaceAfter);
-            scriptNode.parentNode.insertBefore(textNode, scriptNode.nextSibling);
-          }
-        }
-
-        return nodes;
-      };
-    } else {
-      buildIESafeDOM = buildDOM;
-    }
-
-    // When parsing innerHTML, the browser may set up DOM with some things
-    // not desired. For example, with a select element context and option
-    // innerHTML the first option will be marked selected.
-    //
-    // This method cleans up some of that, resetting those values back to
-    // their defaults.
-    //
-    function buildSafeDOM(html, contextualElement, dom) {
-      var childNodes = buildIESafeDOM(html, contextualElement, dom);
-
-      if (contextualElement.tagName === 'SELECT') {
-        // Walk child nodes
-        for (var i = 0; childNodes[i]; i++) {
-          // Find and process the first option child node
-          if (childNodes[i].tagName === 'OPTION') {
-            if (detectAutoSelectedOption(childNodes[i].parentNode, childNodes[i], html)) {
-              // If the first node is selected but does not have an attribute,
-              // presume it is not really selected.
-              childNodes[i].parentNode.selectedIndex = -1;
-            }
-            break;
-          }
-        }
-      }
-
-      return childNodes;
-    }
-
-    var buildHTMLDOM;
-    if (needsIntegrationPointFix) {
-      buildHTMLDOM = function buildHTMLDOM(html, contextualElement, dom){
-        if (svgHTMLIntegrationPoints[contextualElement.tagName]) {
-          return buildSafeDOM(html, document.createElement('div'), dom);
-        } else {
-          return buildSafeDOM(html, contextualElement, dom);
-        }
-      };
-    } else {
-      buildHTMLDOM = buildSafeDOM;
-    }
-
-    __exports__.buildHTMLDOM = buildHTMLDOM;
-  });
-enifed("morph/morph",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    var splice = Array.prototype.splice;
-
-    function ensureStartEnd(start, end) {
-      if (start === null || end === null) {
-        throw new Error('a fragment parent must have boundary nodes in order to detect insertion');
-      }
-    }
-
-    function ensureContext(contextualElement) {
-      if (!contextualElement || contextualElement.nodeType !== 1) {
-        throw new Error('An element node must be provided for a contextualElement, you provided ' +
-                        (contextualElement ? 'nodeType ' + contextualElement.nodeType : 'nothing'));
-      }
-    }
-
-    // TODO: this is an internal API, this should be an assert
-    function Morph(parent, start, end, domHelper, contextualElement) {
-      if (parent.nodeType === 11) {
-        ensureStartEnd(start, end);
-        this.element = null;
-      } else {
-        this.element = parent;
-      }
-      this._parent = parent;
-      this.start = start;
-      this.end = end;
-      this.domHelper = domHelper;
-      ensureContext(contextualElement);
-      this.contextualElement = contextualElement;
-      this.reset();
-    }
-
-    Morph.prototype.reset = function() {
-      this.text = null;
-      this.owner = null;
-      this.morphs = null;
-      this.before = null;
-      this.after = null;
-      this.escaped = true;
-    };
-
-    Morph.prototype.parent = function () {
-      if (!this.element) {
-        var parent = this.start.parentNode;
-        if (this._parent !== parent) {
-          this.element = this._parent = parent;
-        }
-      }
-      return this._parent;
-    };
-
-    Morph.prototype.destroy = function () {
-      if (this.owner) {
-        this.owner.removeMorph(this);
-      } else {
-        clear(this.element || this.parent(), this.start, this.end);
-      }
-    };
-
-    Morph.prototype.removeMorph = function (morph) {
-      var morphs = this.morphs;
-      for (var i=0, l=morphs.length; i<l; i++) {
-        if (morphs[i] === morph) {
-          this.replace(i, 1);
-          break;
-        }
-      }
-    };
-
-    Morph.prototype.update = function (nodeOrString) {
-      this._update(this.element || this.parent(), nodeOrString);
-    };
-
-    Morph.prototype.updateNode = function (node) {
-      var parent = this.element || this.parent();
-      if (!node) return this._updateText(parent, '');
-      this._updateNode(parent, node);
-    };
-
-    Morph.prototype.updateText = function (text) {
-      this._updateText(this.element || this.parent(), text);
-    };
-
-    Morph.prototype.updateHTML = function (html) {
-      var parent = this.element || this.parent();
-      if (!html) return this._updateText(parent, '');
-      this._updateHTML(parent, html);
-    };
-
-    Morph.prototype._update = function (parent, nodeOrString) {
-      if (nodeOrString === null || nodeOrString === undefined) {
-        this._updateText(parent, '');
-      } else if (typeof nodeOrString === 'string') {
-        if (this.escaped) {
-          this._updateText(parent, nodeOrString);
-        } else {
-          this._updateHTML(parent, nodeOrString);
-        }
-      } else if (nodeOrString.nodeType) {
-        this._updateNode(parent, nodeOrString);
-      } else if (nodeOrString.string) { // duck typed SafeString
-        this._updateHTML(parent, nodeOrString.string);
-      } else {
-        this._updateText(parent, nodeOrString.toString());
-      }
-    };
-
-    Morph.prototype._updateNode = function (parent, node) {
-      if (this.text) {
-        if (node.nodeType === 3) {
-          this.text.nodeValue = node.nodeValue;
-          return;
-        } else {
-          this.text = null;
-        }
-      }
-      var start = this.start, end = this.end;
-      clear(parent, start, end);
-      parent.insertBefore(node, end);
-      if (this.before !== null) {
-        this.before.end = start.nextSibling;
-      }
-      if (this.after !== null) {
-        this.after.start = end.previousSibling;
-      }
-    };
-
-    Morph.prototype._updateText = function (parent, text) {
-      if (this.text) {
-        this.text.nodeValue = text;
-        return;
-      }
-      var node = this.domHelper.createTextNode(text);
-      this.text = node;
-      clear(parent, this.start, this.end);
-      parent.insertBefore(node, this.end);
-      if (this.before !== null) {
-        this.before.end = node;
-      }
-      if (this.after !== null) {
-        this.after.start = node;
-      }
-    };
-
-    Morph.prototype._updateHTML = function (parent, html) {
-      var start = this.start, end = this.end;
-      clear(parent, start, end);
-      this.text = null;
-      var childNodes = this.domHelper.parseHTML(html, this.contextualElement);
-      appendChildren(parent, end, childNodes);
-      if (this.before !== null) {
-        this.before.end = start.nextSibling;
-      }
-      if (this.after !== null) {
-        this.after.start = end.previousSibling;
-      }
-    };
-
-    Morph.prototype.append = function (node) {
-      if (this.morphs === null) this.morphs = [];
-      var index = this.morphs.length;
-      return this.insert(index, node);
-    };
-
-    Morph.prototype.insert = function (index, node) {
-      if (this.morphs === null) this.morphs = [];
-      var parent = this.element || this.parent();
-      var morphs = this.morphs;
-      var before = index > 0 ? morphs[index-1] : null;
-      var after  = index < morphs.length ? morphs[index] : null;
-      var start  = before === null ? this.start : (before.end === null ? parent.lastChild : before.end.previousSibling);
-      var end    = after === null ? this.end : (after.start === null ? parent.firstChild : after.start.nextSibling);
-      var morph  = new Morph(parent, start, end, this.domHelper, this.contextualElement);
-
-      morph.owner = this;
-      morph._update(parent, node);
-
-      if (before !== null) {
-        morph.before = before;
-        before.end = start.nextSibling;
-        before.after = morph;
-      }
-
-      if (after !== null) {
-        morph.after = after;
-        after.before = morph;
-        after.start = end.previousSibling;
-      }
-
-      this.morphs.splice(index, 0, morph);
-      return morph;
-    };
-
-    Morph.prototype.replace = function (index, removedLength, addedNodes) {
-      if (this.morphs === null) this.morphs = [];
-      var parent = this.element || this.parent();
-      var morphs = this.morphs;
-      var before = index > 0 ? morphs[index-1] : null;
-      var after = index+removedLength < morphs.length ? morphs[index+removedLength] : null;
-      var start = before === null ? this.start : (before.end === null ? parent.lastChild : before.end.previousSibling);
-      var end   = after === null ? this.end : (after.start === null ? parent.firstChild : after.start.nextSibling);
-      var addedLength = addedNodes === undefined ? 0 : addedNodes.length;
-      var args, i, current;
-
-      if (removedLength > 0) {
-        clear(parent, start, end);
-      }
-
-      if (addedLength === 0) {
-        if (before !== null) {
-          before.after = after;
-          before.end = end;
-        }
-        if (after !== null) {
-          after.before = before;
-          after.start = start;
-        }
-        morphs.splice(index, removedLength);
-        return;
-      }
-
-      args = new Array(addedLength+2);
-      if (addedLength > 0) {
-        for (i=0; i<addedLength; i++) {
-          args[i+2] = current = new Morph(parent, start, end, this.domHelper, this.contextualElement);
-          current._update(parent, addedNodes[i]);
-          current.owner = this;
-          if (before !== null) {
-            current.before = before;
-            before.end = start.nextSibling;
-            before.after = current;
-          }
-          before = current;
-          start = end === null ? parent.lastChild : end.previousSibling;
-        }
-        if (after !== null) {
-          current.after = after;
-          after.before = current;
-          after.start = end.previousSibling;
-        }
-      }
-
-      args[0] = index;
-      args[1] = removedLength;
-
-      splice.apply(morphs, args);
-    };
-
-    function appendChildren(parent, end, nodeList) {
-      var ref = end;
-      var i = nodeList.length;
-      var node;
-
-      while (i--) {
-        node = nodeList[i];
-        parent.insertBefore(node, ref);
-        ref = node;
-      }
-    }
-
-    function clear(parent, start, end) {
-      var current, previous;
-      if (end === null) {
-        current = parent.lastChild;
-      } else {
-        current = end.previousSibling;
-      }
-
-      while (current !== null && current !== start) {
-        previous = current.previousSibling;
-        parent.removeChild(current);
-        current = previous;
-      }
-    }
-
-    __exports__["default"] = Morph;
-  });
-enifed("route-recognizer",
+define("route-recognizer",
   ["route-recognizer/dsl","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -43028,7 +41688,7 @@ enifed("route-recognizer",
 
     __exports__["default"] = RouteRecognizer;
   });
-enifed("route-recognizer/dsl",
+define("route-recognizer/dsl",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -43132,15 +41792,8 @@ enifed("route-recognizer/dsl",
       }, this);
     }
   });
-enifed("router",
-  ["./router/router","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var Router = __dependency1__["default"];
 
-    __exports__["default"] = Router;
-  });
-enifed("router/handler-info",
+define("router/handler-info",
   ["./utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -43317,7 +41970,7 @@ enifed("router/handler-info",
 
     __exports__["default"] = HandlerInfo;
   });
-enifed("router/handler-info/factory",
+define("router/handler-info/factory",
   ["router/handler-info/resolved-handler-info","router/handler-info/unresolved-handler-info-by-object","router/handler-info/unresolved-handler-info-by-param","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -43340,7 +41993,7 @@ enifed("router/handler-info/factory",
 
     __exports__["default"] = handlerInfoFactory;
   });
-enifed("router/handler-info/resolved-handler-info",
+define("router/handler-info/resolved-handler-info",
   ["../handler-info","router/utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -43371,7 +42024,7 @@ enifed("router/handler-info/resolved-handler-info",
 
     __exports__["default"] = ResolvedHandlerInfo;
   });
-enifed("router/handler-info/unresolved-handler-info-by-object",
+define("router/handler-info/unresolved-handler-info-by-object",
   ["../handler-info","router/utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -43433,7 +42086,7 @@ enifed("router/handler-info/unresolved-handler-info-by-object",
 
     __exports__["default"] = UnresolvedHandlerInfoByObject;
   });
-enifed("router/handler-info/unresolved-handler-info-by-param",
+define("router/handler-info/unresolved-handler-info-by-param",
   ["../handler-info","router/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -43467,7 +42120,7 @@ enifed("router/handler-info/unresolved-handler-info-by-param",
 
     __exports__["default"] = UnresolvedHandlerInfoByParam;
   });
-enifed("router/router",
+define("router/router",
   ["route-recognizer","rsvp/promise","./utils","./transition-state","./transition","./transition-intent/named-transition-intent","./transition-intent/url-transition-intent","./handler-info","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -43498,58 +42151,6 @@ enifed("router/router",
       this.reset();
     }
 
-    function getTransitionByIntent(intent, isIntermediate) {
-      var wasTransitioning = !!this.activeTransition;
-      var oldState = wasTransitioning ? this.activeTransition.state : this.state;
-      var newTransition;
-
-      var newState = intent.applyToState(oldState, this.recognizer, this.getHandler, isIntermediate);
-      var queryParamChangelist = getChangelist(oldState.queryParams, newState.queryParams);
-
-      if (handlerInfosEqual(newState.handlerInfos, oldState.handlerInfos)) {
-
-        // This is a no-op transition. See if query params changed.
-        if (queryParamChangelist) {
-          newTransition = this.queryParamsTransition(queryParamChangelist, wasTransitioning, oldState, newState);
-          if (newTransition) {
-            return newTransition;
-          }
-        }
-
-        // No-op. No need to create a new transition.
-        return new Transition(this);
-      }
-
-      if (isIntermediate) {
-        setupContexts(this, newState);
-        return;
-      }
-
-      // Create a new transition to the destination route.
-      newTransition = new Transition(this, intent, newState);
-
-      // Abort and usurp any previously active transition.
-      if (this.activeTransition) {
-        this.activeTransition.abort();
-      }
-      this.activeTransition = newTransition;
-
-      // Transition promises by default resolve with resolved state.
-      // For our purposes, swap out the promise to resolve
-      // after the transition has been finalized.
-      newTransition.promise = newTransition.promise.then(function(result) {
-        return finalizeTransition(newTransition, result.state);
-      }, null, promiseLabel("Settle transition promise when transition is finalized"));
-
-      if (!wasTransitioning) {
-        notifyExistingHandlers(this, newState, newTransition);
-      }
-
-      fireQueryParamDidChange(this, newState, queryParamChangelist);
-
-      return newTransition;
-    }
-
     Router.prototype = {
 
       /**
@@ -43614,8 +42215,58 @@ enifed("router/router",
       // it shall remain until our ES6 transpiler can
       // handle cyclical deps.
       transitionByIntent: function(intent, isIntermediate) {
+
+        var wasTransitioning = !!this.activeTransition;
+        var oldState = wasTransitioning ? this.activeTransition.state : this.state;
+        var newTransition;
+        var router = this;
+
         try {
-          return getTransitionByIntent.apply(this, arguments);
+          var newState = intent.applyToState(oldState, this.recognizer, this.getHandler, isIntermediate);
+          var queryParamChangelist = getChangelist(oldState.queryParams, newState.queryParams);
+
+          if (handlerInfosEqual(newState.handlerInfos, oldState.handlerInfos)) {
+
+            // This is a no-op transition. See if query params changed.
+            if (queryParamChangelist) {
+              newTransition = this.queryParamsTransition(queryParamChangelist, wasTransitioning, oldState, newState);
+              if (newTransition) {
+                return newTransition;
+              }
+            }
+
+            // No-op. No need to create a new transition.
+            return new Transition(this);
+          }
+
+          if (isIntermediate) {
+            setupContexts(this, newState);
+            return;
+          }
+
+          // Create a new transition to the destination route.
+          newTransition = new Transition(this, intent, newState);
+
+          // Abort and usurp any previously active transition.
+          if (this.activeTransition) {
+            this.activeTransition.abort();
+          }
+          this.activeTransition = newTransition;
+
+          // Transition promises by default resolve with resolved state.
+          // For our purposes, swap out the promise to resolve
+          // after the transition has been finalized.
+          newTransition.promise = newTransition.promise.then(function(result) {
+            return finalizeTransition(newTransition, result.state);
+          }, null, promiseLabel("Settle transition promise when transition is finalized"));
+
+          if (!wasTransitioning) {
+            notifyExistingHandlers(this, newState, newTransition);
+          }
+
+          fireQueryParamDidChange(this, newState, queryParamChangelist);
+
+          return newTransition;
         } catch(e) {
           return new Transition(this, intent, null, e);
         }
@@ -43957,9 +42608,7 @@ enifed("router/router",
       var handler = handlerInfo.handler,
           context = handlerInfo.context;
 
-      if (enter) {
-        callHook(handler, 'enter', transition);
-      }
+      callHook(handler, 'enter', transition);
       if (transition && transition.isAborted) {
         throw new TransitionAborted();
       }
@@ -44288,7 +42937,7 @@ enifed("router/router",
 
     __exports__["default"] = Router;
   });
-enifed("router/transition-intent",
+define("router/transition-intent",
   ["./utils","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -44308,7 +42957,7 @@ enifed("router/transition-intent",
 
     __exports__["default"] = TransitionIntent;
   });
-enifed("router/transition-intent/named-transition-intent",
+define("router/transition-intent/named-transition-intent",
   ["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -44509,7 +43158,7 @@ enifed("router/transition-intent/named-transition-intent",
       }
     });
   });
-enifed("router/transition-intent/url-transition-intent",
+define("router/transition-intent/url-transition-intent",
   ["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -44579,7 +43228,7 @@ enifed("router/transition-intent/url-transition-intent",
       this.name = "UnrecognizedURLError";
     }
   });
-enifed("router/transition-state",
+define("router/transition-state",
   ["./handler-info","./utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -44695,7 +43344,7 @@ enifed("router/transition-state",
 
     __exports__["default"] = TransitionState;
   });
-enifed("router/transition",
+define("router/transition",
   ["rsvp/promise","./handler-info","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -45006,7 +43655,7 @@ enifed("router/transition",
     __exports__.logAbort = logAbort;
     __exports__.TransitionAborted = TransitionAborted;
   });
-enifed("router/utils",
+define("router/utils",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -45225,7 +43874,16 @@ enifed("router/utils",
     __exports__.resolveHook = resolveHook;
     __exports__.applyHook = applyHook;
   });
-enifed("rsvp",
+define("router",
+  ["./router/router","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Router = __dependency1__["default"];
+
+    __exports__["default"] = Router;
+  });
+
+define("rsvp",
   ["./rsvp/promise","./rsvp/events","./rsvp/node","./rsvp/all","./rsvp/all-settled","./rsvp/race","./rsvp/hash","./rsvp/hash-settled","./rsvp/rethrow","./rsvp/defer","./rsvp/config","./rsvp/map","./rsvp/resolve","./rsvp/reject","./rsvp/filter","./rsvp/asap","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
     "use strict";
@@ -45292,7 +43950,7 @@ enifed("rsvp",
     __exports__.map = map;
     __exports__.filter = filter;
   });
-enifed("rsvp.umd",
+define("rsvp.umd",
   ["./rsvp"],
   function(__dependency1__) {
     "use strict";
@@ -45337,15 +43995,15 @@ enifed("rsvp.umd",
     };
 
     /* global define:true module:true window: true */
-    if (typeof enifed === 'function' && enifed['amd']) {
-      enifed(function() { return RSVP; });
-    } else if (typeof module !== 'undefined' && module['exports']) {
-      module['exports'] = RSVP;
+    if (typeof define === 'function' && define.amd) {
+      define(function() { return RSVP; });
+    } else if (typeof module !== 'undefined' && module.exports) {
+      module.exports = RSVP;
     } else if (typeof this !== 'undefined') {
       this['RSVP'] = RSVP;
     }
   });
-enifed("rsvp/-internal",
+define("rsvp/-internal",
   ["./utils","./instrument","./config","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -45356,10 +44014,6 @@ enifed("rsvp/-internal",
 
     var config = __dependency3__.config;
 
-    function  withOwnPromise() {
-      return new TypeError('A promises callback cannot return that same promise.');
-    }
-
     function noop() {}
 
     var PENDING   = void 0;
@@ -45559,7 +44213,7 @@ enifed("rsvp/-internal",
         }
 
         if (promise === value) {
-          reject(promise, withOwnPromise());
+          reject(promise, new TypeError('A promises callback cannot return that same promise.'));
           return;
         }
 
@@ -45606,7 +44260,7 @@ enifed("rsvp/-internal",
     __exports__.REJECTED = REJECTED;
     __exports__.PENDING = PENDING;
   });
-enifed("rsvp/all-settled",
+define("rsvp/all-settled",
   ["./enumerator","./promise","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -45682,7 +44336,7 @@ enifed("rsvp/all-settled",
       return new AllSettled(Promise, entries, label).promise;
     }
   });
-enifed("rsvp/all",
+define("rsvp/all",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -45702,7 +44356,7 @@ enifed("rsvp/all",
       return Promise.all(array, label);
     }
   });
-enifed("rsvp/asap",
+define("rsvp/asap",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -45720,8 +44374,7 @@ enifed("rsvp/asap",
       }
     }
 
-    var browserWindow = (typeof window !== 'undefined') ? window : undefined
-    var browserGlobal = browserWindow || {};
+    var browserGlobal = (typeof window !== 'undefined') ? window : {};
     var BrowserMutationObserver = browserGlobal.MutationObserver || browserGlobal.WebKitMutationObserver;
 
     // test for web worker but not in IE10
@@ -45736,13 +44389,6 @@ enifed("rsvp/asap",
       };
     }
 
-    // vertx
-    function useVertxTimer() {
-      return function() {
-        vertxNext(flush);
-      };
-    }
-
     function useMutationObserver() {
       var iterations = 0;
       var observer = new BrowserMutationObserver(flush);
@@ -45784,17 +44430,8 @@ enifed("rsvp/asap",
       len = 0;
     }
 
-    function attemptVertex() {
-      try {
-        var vertx = eriuqer('vertx');
-        var vertxNext = vertx.runOnLoop || vertx.runOnContext;
-        return useVertxTimer();
-      } catch(e) {
-        return useSetTimeout();
-      }
-    }
-
     var scheduleFlush;
+
     // Decide what async method to use to triggering processing of queued callbacks:
     if (typeof process !== 'undefined' && {}.toString.call(process) === '[object process]') {
       scheduleFlush = useNextTick();
@@ -45802,13 +44439,11 @@ enifed("rsvp/asap",
       scheduleFlush = useMutationObserver();
     } else if (isWorker) {
       scheduleFlush = useMessageChannel();
-    } else if (browserWindow === undefined && typeof eriuqer === 'function') {
-      scheduleFlush = attemptVertex();
     } else {
       scheduleFlush = useSetTimeout();
     }
   });
-enifed("rsvp/config",
+define("rsvp/config",
   ["./events","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -45839,7 +44474,7 @@ enifed("rsvp/config",
     __exports__.config = config;
     __exports__.configure = configure;
   });
-enifed("rsvp/defer",
+define("rsvp/defer",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -45881,15 +44516,15 @@ enifed("rsvp/defer",
     __exports__["default"] = function defer(label) {
       var deferred = { };
 
-      deferred['promise'] = new Promise(function(resolve, reject) {
-        deferred['resolve'] = resolve;
-        deferred['reject'] = reject;
+      deferred.promise = new Promise(function(resolve, reject) {
+        deferred.resolve = resolve;
+        deferred.reject = reject;
       }, label);
 
       return deferred;
     }
   });
-enifed("rsvp/enumerator",
+define("rsvp/enumerator",
   ["./utils","./-internal","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -46015,7 +44650,7 @@ enifed("rsvp/enumerator",
       });
     };
   });
-enifed("rsvp/events",
+define("rsvp/events",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -46221,7 +44856,7 @@ enifed("rsvp/events",
       }
     };
   });
-enifed("rsvp/filter",
+define("rsvp/filter",
   ["./promise","./utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -46344,7 +44979,7 @@ enifed("rsvp/filter",
       });
     }
   });
-enifed("rsvp/hash-settled",
+define("rsvp/hash-settled",
   ["./promise","./enumerator","./promise-hash","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -46471,7 +45106,7 @@ enifed("rsvp/hash-settled",
       return new HashSettled(Promise, object, label).promise;
     }
   });
-enifed("rsvp/hash",
+define("rsvp/hash",
   ["./promise","./promise-hash","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -46570,7 +45205,7 @@ enifed("rsvp/hash",
       return new PromiseHash(Promise, object, label).promise;
     }
   });
-enifed("rsvp/instrument",
+define("rsvp/instrument",
   ["./config","./utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -46579,44 +45214,31 @@ enifed("rsvp/instrument",
 
     var queue = [];
 
-    function scheduleFlush() {
-      setTimeout(function() {
-        var entry;
-        for (var i = 0; i < queue.length; i++) {
-          entry = queue[i];
-
-          var payload = entry.payload;
-
-          payload.guid = payload.key + payload.id;
-          payload.childGuid = payload.key + payload.childId;
-          if (payload.error) {
-            payload.stack = payload.error.stack;
-          }
-
-          config.trigger(entry.name, entry.payload);
-        }
-        queue.length = 0;
-      }, 50);
-    }
-
     __exports__["default"] = function instrument(eventName, promise, child) {
       if (1 === queue.push({
           name: eventName,
           payload: {
-            key: promise._guidKey,
-            id:  promise._id,
+            guid: promise._guidKey + promise._id,
             eventName: eventName,
             detail: promise._result,
-            childId: child && child._id,
+            childGuid: child && promise._guidKey + child._id,
             label: promise._label,
             timeStamp: now(),
-            error: config["instrument-with-stack"] ? new Error(promise._label) : null
+            stack: new Error(promise._label).stack
           }})) {
-            scheduleFlush();
+
+            setTimeout(function() {
+              var entry;
+              for (var i = 0; i < queue.length; i++) {
+                entry = queue[i];
+                config.trigger(entry.name, entry.payload);
+              }
+              queue.length = 0;
+            }, 50);
           }
       }
   });
-enifed("rsvp/map",
+define("rsvp/map",
   ["./promise","./utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -46718,7 +45340,7 @@ enifed("rsvp/map",
       });
     }
   });
-enifed("rsvp/node",
+define("rsvp/node",
   ["./promise","./-internal","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -47002,7 +45624,7 @@ enifed("rsvp/node",
       }
     }
   });
-enifed("rsvp/promise-hash",
+define("rsvp/promise-hash",
   ["./enumerator","./-internal","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -47054,7 +45676,7 @@ enifed("rsvp/promise-hash",
       }
     };
   });
-enifed("rsvp/promise",
+define("rsvp/promise",
   ["./config","./instrument","./utils","./-internal","./promise/all","./promise/race","./promise/resolve","./promise/reject","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -47543,7 +46165,7 @@ enifed("rsvp/promise",
       }
     };
   });
-enifed("rsvp/promise/all",
+define("rsvp/promise/all",
   ["../enumerator","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -47600,7 +46222,7 @@ enifed("rsvp/promise/all",
       return new Enumerator(this, entries, true /* abort on reject */, label).promise;
     }
   });
-enifed("rsvp/promise/race",
+define("rsvp/promise/race",
   ["../utils","../-internal","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -47706,7 +46328,7 @@ enifed("rsvp/promise/race",
       return promise;
     }
   });
-enifed("rsvp/promise/reject",
+define("rsvp/promise/reject",
   ["../-internal","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -47756,7 +46378,7 @@ enifed("rsvp/promise/reject",
       return promise;
     }
   });
-enifed("rsvp/promise/resolve",
+define("rsvp/promise/resolve",
   ["../-internal","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -47808,7 +46430,7 @@ enifed("rsvp/promise/resolve",
       return promise;
     }
   });
-enifed("rsvp/race",
+define("rsvp/race",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -47828,7 +46450,7 @@ enifed("rsvp/race",
       return Promise.race(array, label);
     }
   });
-enifed("rsvp/reject",
+define("rsvp/reject",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -47849,7 +46471,7 @@ enifed("rsvp/reject",
       return Promise.reject(reason, label);
     }
   });
-enifed("rsvp/resolve",
+define("rsvp/resolve",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -47871,7 +46493,7 @@ enifed("rsvp/resolve",
       return Promise.resolve(value, label);
     }
   });
-enifed("rsvp/rethrow",
+define("rsvp/rethrow",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -47922,7 +46544,7 @@ enifed("rsvp/rethrow",
       throw reason;
     }
   });
-enifed("rsvp/utils",
+define("rsvp/utils",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -47969,4 +46591,4 @@ enifed("rsvp/utils",
   });
 requireModule("ember");
 
-})();
+})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/production/list-view.js b/vendor/assets/javascripts/production/list-view.js
new file mode 100755
index 0000000000..eb9e791e84
--- /dev/null
+++ b/vendor/assets/javascripts/production/list-view.js
@@ -0,0 +1,8 @@
+// ==========================================================================
+// Project:   Ember ListView
+// Copyright: ©2012-2013 Erik Bryn, Yapp Inc., and contributors.
+// License:   Licensed under MIT license
+// Version:   0.0.5
+// ==========================================================================
+
+(function(e){var t,i,n,r;(function(){var e;if(!Array.isArray){e=function(e){return Object.prototype.toString.call(e)==="[object Array]"}}else{e=Array.isArray}var s={},o={},l={};var h=false;t=function(t,i,n){if(!e(i)){n=i;i=[]}s[t]={deps:i,callback:n}};function a(e,t,i){var r=e.length;var s=new Array(r);var o;var l;for(var h=0,a=r;h<a;h++){o=e[h];if(o==="exports"){l=s[h]=i}else{s[h]=n(c(o,t))}}return{deps:s,exports:l}}r=n=i=function(e){if(l[e]!==h&&o.hasOwnProperty(e)){return o[e]}if(!s[e]){throw new Error("Could not find module "+e)}var t=s[e];var i;var n;var r=false;o[e]={};try{i=a(t.deps,e,o[e]);n=t.callback.apply(this,i.deps);r=true}finally{if(!r){l[e]=h}}return i.exports?o[e]:o[e]=n};function c(e,t){if(e.charAt(0)!=="."){return e}var i=e.split("/");var n=t.split("/");var r;if(n.length===1){r=n}else{r=n.slice(0,-1)}for(var s=0,o=i.length;s<o;s++){var l=i[s];if(l===".."){r.pop()}else if(l==="."){continue}else{r.push(l)}}return r.join("/")}r.entries=r._eak_seen=s;r.clear=function(){r.entries=r._eak_seen=s={};o=l={}}})();t("list-view/helper",["exports"],function(e){"use strict";e["default"]=function t(e){var t=e.hash;var i=e.hashTypes;t.content=t.items;delete t.items;i.content=i.items;delete i.items;if(!t.content){t.content="this";i.content="ID"}for(var n in t){if(/-/.test(n)){var r=Ember.String.camelize(n);t[r]=t[n];i[r]=i[n];delete t[n];delete i[n]}}return Ember.Handlebars.helpers.collection.call(this,"Ember.ListView",e)}});t("list-view/list_item_view",["list-view/list_item_view_mixin","exports"],function(e,t){"use strict";var i=e["default"];var n=Ember.get,r=Ember.set;function s(e){var t=[],i=e.childBuffers;Ember.ArrayPolyfills.forEach.call(i,function(e){var i=typeof e==="string";if(i){t.push(e)}else{e.array(t)}});return t.join("")}function o(e){if(e.willInsertElement){e.willInsertElement()}}function l(e){if(e.didInsertElement){e.didInsertElement()}}function h(){var e,t,i,h;e=n(this,"element");if(!e){return}i=n(this,"context");this.triggerRecursively("willClearRender");if(this.lengthAfterRender>this.lengthBeforeRender){this.clearRenderedChildren();this._childViews.length=this.lengthBeforeRender}if(i){t=Ember.RenderBuffer();t=this.renderToBuffer(t);h=this._childViews.length>0;if(h){this.invokeRecursively(o,false)}e.innerHTML=t.innerString?t.innerString():s(t);r(this,"element",e);var a=this._transitionTo?this._transitionTo:this.transitionTo;a.call(this,"inDOM");if(h){this.invokeRecursively(l,false)}}else{e.innerHTML=""}}t["default"]=Ember.View.extend(i,{updateContext:function(e){var t=n(this,"context");Ember.instrument("view.updateContext.render",this,function(){if(t!==e){r(this,"context",e);if(e&&e.isController){r(this,"controller",e)}}},this)},rerender:function(){Ember.run.scheduleOnce("render",this,h)},_contextDidChange:Ember.observer(h,"context","controller")})});t("list-view/list_item_view_mixin",["exports"],function(e){"use strict";var t=Ember.get,i=Ember.set;function n(e,t){return e&&t&&e.x===t.x&&e.y===t.y}function r(){var e,i,r;Ember.instrument("view.updateContext.positionElement",this,function(){e=t(this,"element");i=this.position;r=this._position;if(!i||!e){return}if(n(i,r)){return}Ember.run.schedule("render",this,this._parentView.applyTransform,e,i.x,i.y);this._position=i},this)}e["default"]=Ember.Mixin.create({init:function(){this._super();this.one("didInsertElement",r)},classNames:["ember-list-item-view"],_position:null,updatePosition:function(e){this.position=e;this._positionElement()},_positionElement:r})});t("list-view/list_view",["list-view/list_view_helper","list-view/list_view_mixin","exports"],function(e,t,i){"use strict";var n=e["default"];var r=t["default"];var s=Ember.get,o=Ember.set;i["default"]=Ember.ContainerView.extend(r,{css:{position:"relative",overflow:"auto","-webkit-overflow-scrolling":"touch","overflow-scrolling":"touch"},applyTransform:n.applyTransform,_scrollTo:function(e){var t=s(this,"element");if(t){t.scrollTop=e}},didInsertElement:function(){var e=this;var t=s(this,"element");this._updateScrollableHeight();this._scroll=function(t){e.scroll(t)};Ember.$(t).on("scroll",this._scroll)},willDestroyElement:function(){var e;e=s(this,"element");Ember.$(e).off("scroll",this._scroll)},scroll:function(e){this.scrollTo(e.target.scrollTop)},scrollTo:function(e){var t=s(this,"element");this._scrollTo(e);this._scrollContentTo(e)},totalHeightDidChange:Ember.observer(function(){Ember.run.scheduleOnce("afterRender",this,this._updateScrollableHeight)},"totalHeight"),_updateScrollableHeight:function(){var e,t;t=this._state||this.state;if(t==="inDOM"){if(this._isChildEmptyView()){e=""}else{e=s(this,"totalHeight")}this.$(".ember-list-container").css({height:e})}}})});t("list-view/list_view_helper",["exports"],function(e){"use strict";var t=document.createElement("div"),i=t.style;var n=["Webkit","Moz","O","ms"];function r(e){if(e in i)return e;var t=e.charAt(0).toUpperCase()+e.slice(1);for(var r=0;r<n.length;r++){var s=n[r]+t;if(s in i){return s}}return null}var s=r("transform");var o=r("perspective");var l=s!==null;var h=o!==null;e["default"]={transformProp:s,applyTransform:function(){if(l){return function(e,t,i){e.style[s]="translate("+t+"px, "+i+"px)"}}else{return function(e,t,i){e.style.top=i+"px";e.style.left=t+"px"}}}(),apply3DTransform:function(){if(h){return function(e,t,i){e.style[s]="translate3d("+t+"px, "+i+"px, 0)"}}else if(l){return function(e,t,i){e.style[s]="translate("+t+"px, "+i+"px)"}}else{return function(e,t,i){e.style.top=i+"px";e.style.left=t+"px"}}}()}});t("list-view/list_view_mixin",["list-view/reusable_list_item_view","exports"],function(e,t){"use strict";var i=e["default"];var n=Ember.get,r=Ember.set,s=Math.min,o=Math.max,l=Math.floor,h=Math.ceil,a=Ember.ArrayPolyfills.forEach;function c(){var e=n(this,"content");if(e){e.addArrayObserver(this)}}function u(e){this.removeObject(e);e.destroy()}function d(){Ember.run.once(this,"_syncChildViews")}function f(e,t){return n(e,"contentIndex")-n(t,"contentIndex")}function m(){if(Ember.View.notifyMutationListeners){Ember.run.once(Ember.View,"notifyMutationListeners")}}function v(){var e=n(this,"emptyView");if(e&&e instanceof Ember.View){e.removeFromParent();if(this.totalHeightDidChange!==undefined){this.totalHeightDidChange()}}}function g(){var e=n(this,"emptyView");if(!e){return}if("string"===typeof e){e=n(e)||e}e=this.createChildView(e);r(this,"emptyView",e);if(Ember.CoreView.detect(e)){this._createdEmptyView=e}this.unshiftObject(e)}var w=Ember.create(Ember.ContainerView.proto().domManager);w.prepend=function(e,t){e.$(".ember-list-container").prepend(t);m()};function p(){function e(e,t,i){console.time(e)}function t(e,t,i){console.timeEnd(e)}if(Ember.ENABLE_PROFILING){Ember.subscribe("view._scrollContentTo",{before:e,after:t});Ember.subscribe("view.updateContext",{before:e,after:t})}}t["default"]=Ember.Mixin.create({itemViewClass:i,emptyViewClass:Ember.View,classNames:["ember-list-view"],attributeBindings:["style"],classNameBindings:["_isGrid:ember-list-view-grid:ember-list-view-list"],domManager:w,scrollTop:0,bottomPadding:0,_lastEndingIndex:0,paddingCount:1,_cachedPos:0,_isGrid:Ember.computed("columnCount",function(){return this.get("columnCount")>1}).readOnly(),init:function(){this._super();this._cachedHeights=[0];this.on("didInsertElement",this._syncListContainerWidth);this.columnCountDidChange();this._syncChildViews();this._addContentArrayObserver()},_addContentArrayObserver:Ember.beforeObserver(function(){c.call(this)},"content"),render:function(e){e.push('<div class="ember-list-container">');this._super(e);e.push("</div>")},willInsertElement:function(){if(!this.get("height")||!this.get("rowHeight")){throw new Error("A ListView must be created with a height and a rowHeight.")}this._super()},style:Ember.computed("height","width",function(){var e,t,i,r;e=n(this,"height");t=n(this,"width");r=n(this,"css");i="";if(e){i+="height:"+e+"px;"}if(t){i+="width:"+t+"px;"}for(var s in r){if(r.hasOwnProperty(s)){i+=s+":"+r[s]+";"}}return i}),scrollTo:function(e){throw new Error("must override to perform the visual scroll and effectively delegate to _scrollContentTo")},_scrollTo:Ember.K,_scrollContentTo:function(e){var t,i,r,l,h,a,c,u,d;u=o(0,e);if(this.scrollTop===u){return}var f=o(0,n(this,"totalHeight")-n(this,"height"));u=s(u,f);d=n(this,"content");c=n(d,"length");t=this._startingIndex(c);Ember.instrument("view._scrollContentTo",{scrollTop:u,content:d,startingIndex:t,endingIndex:s(o(c-1,0),t+this._numChildViewsForViewport())},function(){this.scrollTop=u;h=o(c-1,0);t=this._startingIndex();l=t+this._numChildViewsForViewport();i=s(h,l);if(t===this._lastStartingIndex&&i===this._lastEndingIndex){this.trigger("scrollYChanged",e);return}else{Ember.run(this,function(){this._reuseChildren();this._lastStartingIndex=t;this._lastEndingIndex=i;this.trigger("scrollYChanged",e)})}},this)},totalHeight:Ember.computed("content.length","rowHeight","columnCount","bottomPadding",function(){if(typeof this.heightForIndex==="function"){return this._totalHeightWithHeightForIndex()}else{return this._totalHeightWithStaticRowHeight()}}),_doRowHeightDidChange:function(){this._cachedHeights=[0];this._cachedPos=0;this._syncChildViews()},_rowHeightDidChange:Ember.observer("rowHeight",function(){Ember.run.once(this,this._doRowHeightDidChange)}),_totalHeightWithHeightForIndex:function(){var e=this.get("content.length");return this._cachedHeightLookup(e)},_totalHeightWithStaticRowHeight:function(){var e,t,i,r;e=n(this,"content.length");t=n(this,"rowHeight");i=n(this,"columnCount");r=n(this,"bottomPadding");return h(e/i)*t+r},_prepareChildForReuse:function(e){e.prepareForReuse()},_reuseChildForContentIndex:function(e,t){var i,s,o,l,h,a,c;var u=this.itemViewForIndex(t);if(e.constructor!==u){var d=this._childViews.indexOf(e);e.destroy();e=this.createChildView(u);this.insertAt(d,e)}i=n(this,"content");a=n(this,"enableProfiling");h=this.positionForIndex(t);e.updatePosition(h);r(e,"contentIndex",t);if(a){Ember.instrument("view._reuseChildForContentIndex",h,function(){},this)}o=i.objectAt(t);e.updateContext(o)},positionForIndex:function(e){if(typeof this.heightForIndex!=="function"){return this._singleHeightPosForIndex(e)}else{return this._multiHeightPosForIndex(e)}},_singleHeightPosForIndex:function(e){var t,i,r,s,o,h;t=n(this,"elementWidth")||1;i=n(this,"width")||1;r=n(this,"columnCount");s=n(this,"rowHeight");o=s*l(e/r);h=e%r*t;return{y:o,x:h}},_multiHeightPosForIndex:function(e){var t,i,r,s,o,l;t=n(this,"elementWidth")||1;i=n(this,"width")||1;r=n(this,"columnCount");l=e%r*t;o=this._cachedHeightLookup(e);return{x:l,y:o}},_cachedHeightLookup:function(e){for(var t=this._cachedPos;t<e;t++){this._cachedHeights[t+1]=this._cachedHeights[t]+this.heightForIndex(t)}this._cachedPos=t;return this._cachedHeights[e]},_childViewCount:function(){var e,t;e=n(this,"content.length");t=this._numChildViewsForViewport();return s(e,t)},columnCount:Ember.computed("width","elementWidth",function(){var e,t,i;e=n(this,"elementWidth");t=n(this,"width");if(e&&t>e){i=l(t/e)}else{i=1}return i}),columnCountDidChange:Ember.observer(function(){var e,t,i,r,o,l,h,a;l=this._lastColumnCount;t=this.scrollTop;h=n(this,"columnCount");r=n(this,"maxScrollTop");a=n(this,"element");this._lastColumnCount=h;if(l){e=l/h;i=t*e;o=s(r,i);this._scrollTo(o);this.scrollTop=o}if(arguments.length>0){Ember.run.schedule("afterRender",this,this._syncListContainerWidth)}},"columnCount"),maxScrollTop:Ember.computed("height","totalHeight",function(){var e,t;e=n(this,"totalHeight");t=n(this,"height");return o(0,e-t)}),_isChildEmptyView:function(){var e=n(this,"emptyView");return e&&e instanceof Ember.View&&this._childViews.length===1&&this._childViews.indexOf(e)===0},_numChildViewsForViewport:function(){if(this.heightForIndex){return this._numChildViewsForViewportWithMultiHeight()}else{return this._numChildViewsForViewportWithoutMultiHeight()}},_numChildViewsForViewportWithoutMultiHeight:function(){var e,t,i,r;e=n(this,"height");t=n(this,"rowHeight");i=n(this,"paddingCount");r=n(this,"columnCount");return h(e/t)*r+i*r},_numChildViewsForViewportWithMultiHeight:function(){var e,t,i;var r=this.scrollTop;var s=this.get("height");var o=this.get("content.length");var l=0;var h=n(this,"paddingCount");var a=this._calculatedStartingIndex();var c=0;var u=this._cachedHeightLookup(a);for(var d=0;d<o;d++){if(this._cachedHeightLookup(a+d+1)-u>s){break}}return d+h+1},_startingIndex:function(e){var t,i,r,h,a;if(e===undefined){a=n(this,"content.length")}else{a=e}t=this.scrollTop;i=n(this,"rowHeight");r=n(this,"columnCount");if(this.heightForIndex){h=this._calculatedStartingIndex()}else{h=l(t/i)*r}var c=this._numChildViewsForViewport();var u=1*r;var d=o(a-c,0);return s(h,d)},_calculatedStartingIndex:function(){var e,t,i;var r=this.scrollTop;var s=this.get("height");var o=this.get("content.length");var l=0;var h=n(this,"paddingCount");for(var a=0;a<o;a++){if(this._cachedHeightLookup(a+1)>=r){break}}return a},contentWillChange:Ember.beforeObserver(function(){var e;e=n(this,"content");if(e){e.removeArrayObserver(this)}},"content"),contentDidChange:Ember.observer(function(){c.call(this);d.call(this)},"content"),needsSyncChildViews:Ember.observer(d,"height","width","columnCount"),_addItemView:function(e){var t,i;t=this.itemViewForIndex(e);i=this.createChildView(t);this.pushObject(i)},itemViewForIndex:function(e){return n(this,"itemViewClass")},heightForIndex:null,_syncChildViews:function(){var e,t,i,r,s,o,l,h,c,d,f;if(n(this,"isDestroyed")||n(this,"isDestroying")){return}h=n(this,"content.length");c=n(this,"emptyView");t=this._childViewCount();e=this.positionOrderedChildViews();if(this._isChildEmptyView()){v.call(this)}o=this._startingIndex();l=o+t;r=t;i=e.length;f=r-i;if(f===0){}else if(f>0){s=this._lastEndingIndex;for(d=0;d<f;d++,s++){this._addItemView(s)}}else{a.call(e.splice(r,i),u,this)}this._reuseChildren();this._lastStartingIndex=o;this._lastEndingIndex=this._lastEndingIndex+f;if(h===0||h===undefined){g.call(this)}},_syncListContainerWidth:function(){var e,t,i,r;e=n(this,"elementWidth");t=n(this,"columnCount");i=e*t;r=this.$(".ember-list-container");if(i&&r){r.css("width",i)}},_reuseChildren:function(){var e,t,i,r,l,h,a,c,u,d,f,m;m=this.scrollTop;e=n(this,"content.length");d=o(e-1,0);t=this.getReusableChildViews();i=t.length;r=this._startingIndex();u=r+this._numChildViewsForViewport();l=s(d,u);f=s(u,r+i);for(c=r;c<f;c++){h=t[c%i];this._reuseChildForContentIndex(h,c)}},getReusableChildViews:function(){return this._childViews},positionOrderedChildViews:function(){return this.getReusableChildViews().sort(f)},arrayWillChange:Ember.K,arrayDidChange:function(e,t,i,n){var r,s,o;if(this._isChildEmptyView()){v.call(this)}o=this._state||this.state;if(o==="inDOM"){if(t>=this._lastStartingIndex||t<this._lastEndingIndex){r=0;a.call(this.positionOrderedChildViews(),function(e){s=this._lastStartingIndex+r;this._reuseChildForContentIndex(e,s);r++},this)}d.call(this)}},destroy:function(){if(!this._super()){return}if(this._createdEmptyView){this._createdEmptyView.destroy()}return this}})});t("list-view/main",["list-view/reusable_list_item_view","list-view/virtual_list_view","list-view/list_item_view","list-view/helper","list-view/list_view","list-view/list_view_helper"],function(e,t,i,n,r,s){"use strict";var o=e["default"];var l=t["default"];var h=i["default"];var a=n["default"];var c=r["default"];var u=s["default"];Ember.ReusableListItemView=o;Ember.VirtualListView=l;Ember.ListItemView=h;Ember.ListView=c;Ember.ListViewHelper=u;Ember.Handlebars.registerHelper("ember-list",a)});t("list-view/reusable_list_item_view",["list-view/list_item_view_mixin","exports"],function(e,t){"use strict";var i=e["default"];var n=Ember.get,r=Ember.set;t["default"]=Ember.View.extend(i,{init:function(){this._super();var e=Ember.ObjectProxy.create();this.set("context",e);this._proxyContext=e},isVisible:Ember.computed("context.content",function(){return!!this.get("context.content")}),updateContext:function(e){var t=n(this._proxyContext,"content"),i;i=this._state||this.state;if(t!==e){if(i==="inDOM"){this.prepareForReuse(e)}r(this._proxyContext,"content",e);if(e&&e.isController){r(this,"controller",e)}}},prepareForReuse:Ember.K})});t("list-view/virtual_list_scroller_events",["exports"],function(e){"use strict";var t=/input|textarea|select/i,i="ontouchstart"in window||window.DocumentTouch&&document instanceof window.DocumentTouch,n,r,s,o,l,h,a,c;if(i){l="touchstart";n=function(e){var i=e.touches[0],n=i&&i.target;if(n&&t.test(n.tagName)){return}m(this.scrollerEventHandlers);this.willBeginScroll(e.touches,e.timeStamp);e.preventDefault()};h="touchmove";r=function(e){this.continueScroll(e.touches,e.timeStamp)};a="touchend";s=function(e){if(!this._isScrolling){w(e)}v(this.scrollerEventHandlers);this.endScroll(e.timeStamp)};c="touchcancel";o=function(e){v(this.scrollerEventHandlers);this.endScroll(e.timeStamp)}}else{l="mousedown";n=function(e){if(e.which!==1)return;var i=e.target;if(i&&t.test(i.tagName)){return}m(this.scrollerEventHandlers);this.willBeginScroll([e],e.timeStamp);e.preventDefault()};h="mousemove";r=function(e){this.continueScroll([e],e.timeStamp)};a="mouseup";s=function(e){v(this.scrollerEventHandlers);this.endScroll(e.timeStamp)};c="mouseout";o=function(e){if(e.relatedTarget)return;v(this.scrollerEventHandlers);this.endScroll(e.timeStamp)}}function u(e){this.mouseWheel(e);e.preventDefault()}function d(e,t){e.addEventListener(l,t.start,false);e.addEventListener("mousewheel",t.wheel,false)}function f(e,t){e.removeEventListener(l,t.start,false);e.removeEventListener("mousewheel",t.wheel,false)}function m(e){window.addEventListener(h,e.move,true);window.addEventListener(a,e.end,true);window.addEventListener(c,e.cancel,true)}function v(e){window.removeEventListener(h,e.move,true);window.removeEventListener(a,e.end,true);window.removeEventListener(c,e.cancel,true)}e["default"]=Ember.Mixin.create({init:function(){this.on("didInsertElement",this,"bindScrollerEvents");this.on("willDestroyElement",this,"unbindScrollerEvents");this.scrollerEventHandlers={start:g(this,n),move:g(this,r),end:g(this,s),cancel:g(this,o),wheel:g(this,u)};return this._super()},scrollElement:Ember.computed.oneWay("element").readOnly(),bindScrollerEvents:function(){var e=this.get("scrollElement"),t=this.scrollerEventHandlers;d(e,t)},unbindScrollerEvents:function(){var e=this.get("scrollElement"),t=this.scrollerEventHandlers;f(e,t);v(t)}});function g(e,t){return function(i){t.call(e,i)}}function w(e){var i=e.changedTouches[0],n=i.target,r;if(n&&t.test(n.tagName)){r=document.createEvent("MouseEvents");r.initMouseEvent("click",true,true,e.view,1,i.screenX,i.screenY,i.clientX,i.clientY,e.ctrlKey,e.altKey,e.shiftKey,e.metaKey,0,null);return n.dispatchEvent(r)}}});t("list-view/virtual_list_view",["list-view/list_view_mixin","list-view/list_view_helper","list-view/virtual_list_scroller_events","exports"],function(e,t,i,n){"use strict";var r=e["default"];var s=t["default"];var o=i["default"];var l=Math.max,h=Ember.get,a=Ember.set;function c(e){var t,i,n;e=e||this;t=h(e,"width");i=h(e,"height");n=h(e,"totalHeight");e.scroller.setDimensions(t,i,t,n);e.trigger("scrollerDimensionsDidChange")}n["default"]=Ember.ContainerView.extend(r,o,{_isScrolling:false,_mouseWheel:null,css:{position:"relative",overflow:"hidden"},init:function(){this._super();this.setupScroller();this.setupPullToRefresh()},_scrollerTop:0,applyTransform:s.apply3DTransform,setupScroller:function(){var e,t;e=this;e.scroller=new Scroller(function(t,i,n){var r=e._state||e.state;if(r!=="inDOM"){return}if(e.listContainerElement){e._scrollerTop=i;e._scrollContentTo(i);e.applyTransform(e.listContainerElement,0,-i)}},{scrollingX:false,scrollingComplete:function(){e.trigger("scrollingDidComplete")}});e.trigger("didInitializeScroller");c(e)},setupPullToRefresh:function(){if(!this.pullToRefreshViewClass){return}this._insertPullToRefreshView();this._activateScrollerPullToRefresh()},_insertPullToRefreshView:function(){this.pullToRefreshView=this.createChildView(this.pullToRefreshViewClass);this.insertAt(0,this.pullToRefreshView);var e=this;this.pullToRefreshView.on("didInsertElement",function(){Ember.run.schedule("afterRender",this,function(){e.applyTransform(this.get("element"),0,-1*e.pullToRefreshViewHeight)})})},_activateScrollerPullToRefresh:function(){var e=this;function t(){e.pullToRefreshView.set("active",true);e.trigger("activatePullToRefresh")}function i(){e.pullToRefreshView.set("active",false);e.trigger("deactivatePullToRefresh")}function n(){Ember.run(function(){e.pullToRefreshView.set("refreshing",true);function t(){if(e&&!e.get("isDestroyed")&&!e.get("isDestroying")){e.scroller.finishPullToRefresh();e.pullToRefreshView.set("refreshing",false)}}e.startRefresh(t)})}this.scroller.activatePullToRefresh(this.pullToRefreshViewHeight,t,i,n)},getReusableChildViews:function(){var e=this._childViews[0];if(e&&e===this.pullToRefreshView){return this._childViews.slice(1)}else{return this._childViews}},scrollerDimensionsNeedToChange:Ember.observer(function(){Ember.run.once(this,c)},"width","height","totalHeight"),didInsertElement:function(){this.listContainerElement=this.$("> .ember-list-container")[0]},willBeginScroll:function(e,t){this._isScrolling=false;this.trigger("scrollingDidStart");this.scroller.doTouchStart(e,t)},continueScroll:function(e,t){var i,n,r;if(this._isScrolling){this.scroller.doTouchMove(e,t)}else{i=this._scrollerTop;this.scroller.doTouchMove(e,t);n=this._scrollerTop;if(i!==n){r=Ember.$.Event("scrollerstart");Ember.$(e[0].target).trigger(r);this._isScrolling=true}}},endScroll:function(e){this.scroller.doTouchEnd(e)},scrollTo:function(e,t){if(t===undefined){t=true}this.scroller.scrollTo(0,e,t,1)},mouseWheel:function(e){var t,i,n;t=e.webkitDirectionInvertedFromDevice;i=e.wheelDeltaY*(t?.8:-.8);n=this.scroller.__scrollTop+i;if(n>=0&&n<=this.scroller.__maxScrollTop){this.scroller.scrollBy(0,i,true);e.stopPropagation()}return false}})});i("list-view/main")})(this);
\ No newline at end of file