From 5659b93c71b92f2c2d6fc97881a3c8c86bf3bf74 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 10 Dec 2014 11:34:00 -0500
Subject: [PATCH] Many fixes for Ember 1.9.0

---
 Gemfile                                       |    4 +-
 Gemfile.lock                                  |   10 +-
 .../components/basic-topic-list.js.es6        |    8 -
 .../discourse/ember/resolver.js.es6           |    9 +-
 .../discourse/helpers/application_helpers.js  |   22 +-
 .../discourse/helpers/category-link.js.es6    |    5 +-
 .../discourse/helpers/custom-html.js.es6      |    3 +-
 .../discourse/helpers/format-date.js.es6      |   31 +-
 .../discourse/helpers/i18n_helpers.js         |   25 +-
 .../javascripts/discourse/helpers/raw.js.es6  |    5 +-
 .../discourse/helpers/register-unbound.js.es6 |   26 +
 .../discourse/helpers/topic-link.js.es6       |    6 +-
 .../discourse/helpers/user-avatar.js.es6      |    9 +-
 .../templates/components/basic-topic-list.hbs |   30 +-
 .../discourse/templates/discovery/topics.hbs  |    2 +-
 .../discourse/templates/group/index.hbs       |    2 +-
 .../discourse/templates/modal/modal.hbs       |    4 +-
 .../discourse/templates/user-card.hbs         |    8 +-
 .../discourse/templates/user/badges.hbs       |    4 +-
 .../templates/user/notifications.hbs          |    8 +-
 .../discourse/templates/user/posts.hbs        |    4 +-
 .../discourse/templates/user/stream.hbs       |   28 +-
 .../discourse/templates/user/user.hbs         |    4 +-
 app/assets/javascripts/env.js                 |    7 +-
 app/assets/javascripts/main_include.js        |    1 +
 .../better_handlebars_errors.rb               |   16 +
 .../assets/javascripts/development/ember.js   | 7888 +++++++++--------
 vendor/assets/javascripts/handlebars.js       | 1689 ++--
 vendor/assets/javascripts/production/ember.js | 7623 ++++++++--------
 29 files changed, 9429 insertions(+), 8052 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/helpers/register-unbound.js.es6
 create mode 100644 lib/freedom_patches/better_handlebars_errors.rb

diff --git a/Gemfile b/Gemfile
index 10d3088d624..e5837a1af71 100644
--- a/Gemfile
+++ b/Gemfile
@@ -104,8 +104,8 @@ end
 gem 'onebox'
 
 gem 'ember-rails'
-gem 'ember-source', '1.6.0.beta.2'
-gem 'handlebars-source', '1.3.0'
+gem 'ember-source', '1.9.0.beta.4'
+gem 'handlebars-source', '2.0.0'
 gem 'barber'
 
 gem 'message_bus'
diff --git a/Gemfile.lock b/Gemfile.lock
index dc78e8f6d11..7a108e0c436 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -77,8 +77,8 @@ GEM
       handlebars-source
       jquery-rails (>= 1.0.17)
       railties (>= 3.1)
-    ember-source (1.6.0.beta.2)
-      handlebars-source (~> 1.0)
+    ember-source (1.9.0.beta.4)
+      handlebars-source (~> 2.0)
     erubis (2.7.0)
     eventmachine (1.0.3)
     excon (0.39.6)
@@ -129,7 +129,7 @@ GEM
     given_core (3.5.4)
       sorcerer (>= 0.3.7)
     guess_html_encoding (0.0.9)
-    handlebars-source (1.3.0)
+    handlebars-source (2.0.0)
     hashie (3.3.1)
     highline (1.6.21)
     hike (1.2.3)
@@ -414,7 +414,7 @@ DEPENDENCIES
   certified
   email_reply_parser
   ember-rails
-  ember-source (= 1.6.0.beta.2)
+  ember-source (= 1.9.0.beta.4)
   eventmachine
   fabrication (= 2.9.8)
   fakeweb (~> 1.3.0)
@@ -426,7 +426,7 @@ DEPENDENCIES
   fog (= 1.22.1)
   foreman
   gctools
-  handlebars-source (= 1.3.0)
+  handlebars-source (= 2.0.0)
   highline
   hiredis
   htmlentities
diff --git a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6 b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
index 1b505c6130b..a570ca13db7 100644
--- a/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
+++ b/app/assets/javascripts/discourse/components/basic-topic-list.js.es6
@@ -1,11 +1,3 @@
-/**
-  This view is used for rendering a basic list of topics.
-
-  @class BasicTopicListComponent
-  @extends Discourse.View
-  @namespace Discourse
-  @module Discourse
-**/
 export default Ember.Component.extend({
   loading: Ember.computed.not('loaded'),
 
diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6
index edc98dff7c2..f4de49eacc4 100644
--- a/app/assets/javascripts/discourse/ember/resolver.js.es6
+++ b/app/assets/javascripts/discourse/ember/resolver.js.es6
@@ -4,9 +4,9 @@ var classify = Ember.String.classify;
 var get = Ember.get;
 
 var LOADING_WHITELIST = ['badges', 'userActivity', 'userPrivateMessages', 'admin', 'adminFlags',
-                         'user', 'preferences', 'adminEmail', 'adminUsersList'],
-    _dummyRoute,
-    _loadingView;
+                         'user', 'preferences', 'adminEmail', 'adminUsersList'];
+var _dummyRoute;
+var _loadingView;
 
 function loadingResolver(cb) {
   return function(parsedName) {
@@ -150,8 +150,7 @@ export default Ember.DefaultResolver.extend({
   // Try to find a template with slash instead of first underscore, e.g. foo_bar_baz => foo/bar_baz
   findSlashedTemplate: function(parsedName) {
     var decamelized = parsedName.fullNameWithoutType.decamelize();
-    var slashed = decamelized.replace("_", "/");
-    return Ember.TEMPLATES[slashed];
+    return Ember.TEMPLATES[decamelized.replace("_", "/")] || Ember.TEMPLATES[decamelized.replace('.', '/')];
   },
 
   // Try to find a template within a special admin namespace, e.g. adminEmail => admin/templates/email
diff --git a/app/assets/javascripts/discourse/helpers/application_helpers.js b/app/assets/javascripts/discourse/helpers/application_helpers.js
index ea80064b8a9..923b7ce5afb 100644
--- a/app/assets/javascripts/discourse/helpers/application_helpers.js
+++ b/app/assets/javascripts/discourse/helpers/application_helpers.js
@@ -1,5 +1,8 @@
 var safe = Handlebars.SafeString;
 
+// TODO: Remove me when ES6ified
+var registerUnbound = require('discourse/helpers/register-unbound', null, null, true).default;
+
 /**
   Bound avatar helper.
 
@@ -56,25 +59,18 @@ Handlebars.registerHelper('age-with-tooltip', function(property, options) {
   return new safe(Discourse.Formatter.autoUpdatingRelativeAge(dt, {title: true}));
 });
 
-/**
-  Display logic for numbers.
-
-  @method number
-  @for Handlebars
-**/
-Handlebars.registerHelper('number', function(property, options) {
-
-  var orig = parseInt(Ember.Handlebars.get(this, property, options), 10);
+registerUnbound('number', function(orig, params) {
+  orig = parseInt(orig, 10);
   if (isNaN(orig)) { orig = 0; }
 
   var title = orig;
-  if (options.hash.numberKey) {
-    title = I18n.t(options.hash.numberKey, { number: orig });
+  if (params.numberKey) {
+    title = I18n.t(params.numberKey, { number: orig });
   }
 
   var classNames = 'number';
-  if (options.hash['class']) {
-    classNames += ' ' + Ember.Handlebars.get(this, options.hash['class'], options);
+  if (params['class']) {
+    classNames += ' ' + params['class'];
   }
   var result = "<span class='" + classNames + "'";
 
diff --git a/app/assets/javascripts/discourse/helpers/category-link.js.es6 b/app/assets/javascripts/discourse/helpers/category-link.js.es6
index f206a4a9847..0ce72e0919b 100644
--- a/app/assets/javascripts/discourse/helpers/category-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/category-link.js.es6
@@ -1,5 +1,4 @@
 import { categoryLinkHTML } from 'discourse/lib/html-builder';
+import registerUnbound from 'discourse/helpers/register-unbound';
 
-Handlebars.registerHelper('category-link', function(property, options) {
-  return categoryLinkHTML(Ember.Handlebars.get(this, property, options), options);
-});
+registerUnbound('category-link', categoryLinkHTML);
diff --git a/app/assets/javascripts/discourse/helpers/custom-html.js.es6 b/app/assets/javascripts/discourse/helpers/custom-html.js.es6
index 0088a0bcef9..42155096deb 100644
--- a/app/assets/javascripts/discourse/helpers/custom-html.js.es6
+++ b/app/assets/javascripts/discourse/helpers/custom-html.js.es6
@@ -2,8 +2,7 @@ Handlebars.registerHelper('custom-html', function(name, contextString, options)
   var html = Discourse.HTML.getCustomHTML(name);
   if (html) { return html; }
 
-  var container = (options || contextString).data.keywords.controller.container;
-
+  var container = (options || contextString).data.view.container;
   if (container.lookup('template:' + name)) {
     return Ember.Handlebars.helpers.partial.apply(this, arguments);
   }
diff --git a/app/assets/javascripts/discourse/helpers/format-date.js.es6 b/app/assets/javascripts/discourse/helpers/format-date.js.es6
index 312d8947b01..9f34198cd4f 100644
--- a/app/assets/javascripts/discourse/helpers/format-date.js.es6
+++ b/app/assets/javascripts/discourse/helpers/format-date.js.es6
@@ -1,27 +1,24 @@
+import registerUnbound from 'discourse/helpers/register-unbound';
+
 /**
   Display logic for dates. It is unbound in Ember but will use jQuery to
   update the dates on a regular interval.
 **/
-Handlebars.registerHelper('format-date', function(property, options) {
-  var leaveAgo, format = 'medium', title = true;
-  var hash = property.hash || (options && options.hash);
+registerUnbound('format-date', function(val, params) {
+  var leaveAgo,
+      format = 'medium',
+      title = true;
 
-  if (hash) {
-    if (hash.leaveAgo) {
-      leaveAgo = hash.leaveAgo === "true";
-    }
-    if (hash.path) {
-      property = hash.path;
-    }
-    if (hash.format) {
-      format = hash.format;
-    }
-    if (hash.noTitle) {
-      title = false;
-    }
+  if (params.leaveAgo) {
+    leaveAgo = params.leaveAgo === "true";
+  }
+  if (params.format) {
+    format = params.format;
+  }
+  if (params.noTitle) {
+    title = false;
   }
 
-  var val = Ember.Handlebars.get(this, property, options);
   if (val) {
     var date = new Date(val);
     return new Handlebars.SafeString(Discourse.Formatter.autoUpdatingRelativeAge(date, {format: format, title: title, leaveAgo: leaveAgo}));
diff --git a/app/assets/javascripts/discourse/helpers/i18n_helpers.js b/app/assets/javascripts/discourse/helpers/i18n_helpers.js
index 69e7db0db5a..99ea0a3aa50 100644
--- a/app/assets/javascripts/discourse/helpers/i18n_helpers.js
+++ b/app/assets/javascripts/discourse/helpers/i18n_helpers.js
@@ -1,3 +1,6 @@
+// TODO: Remove me when ES6ified
+var registerUnbound = require('discourse/helpers/register-unbound', null, null, true).default;
+
 /**
  We always prefix with "js." to select exactly what we want passed
  through to the front end.
@@ -17,26 +20,8 @@ I18n.toHumanSize = function(number, options) {
   return oldI18ntoHumanSize.apply(this, [number, options]);
 };
 
-/**
-  Look up a translation for an i18n key in our dictionary.
-
-  @method i18n
-  @for Handlebars
-**/
-Handlebars.registerHelper('i18n', function(property, options) {
-  // Resolve any properties
-  var params = options.hash,
-      self = this;
-
-  if (options.types[0] !== "STRING") {
-    Em.warn("Using the `{{i18n}}` helper without quotes is deprecated.");
-  }
-
-  _.each(params, function(value, key) {
-    params[key] = Em.Handlebars.get(self, value, options);
-  });
-
-  return I18n.t(property, params);
+registerUnbound('i18n', function(key, params) {
+  return I18n.t(key, params);
 });
 
 /**
diff --git a/app/assets/javascripts/discourse/helpers/raw.js.es6 b/app/assets/javascripts/discourse/helpers/raw.js.es6
index 0c1354369a7..8aaa506e566 100644
--- a/app/assets/javascripts/discourse/helpers/raw.js.es6
+++ b/app/assets/javascripts/discourse/helpers/raw.js.es6
@@ -3,6 +3,9 @@ Handlebars.registerHelper('raw', function(property, options) {
       template = Discourse.__container__.lookup('template:' + templateName),
       params = options.hash;
 
+  // {{raw}} helper is broken!
+  return;
+
   if (!template) {
     Ember.warn('Could not find raw template: ' + templateName);
     return;
@@ -11,7 +14,7 @@ Handlebars.registerHelper('raw', function(property, options) {
   if (params) {
     for (var prop in params) {
       if (options.hashTypes[prop] === "ID") {
-        params[prop] = Ember.Handlebars.get(this, params[prop], options);
+        params[prop] = Ember.get(this, params[prop], options);
       }
     }
   }
diff --git a/app/assets/javascripts/discourse/helpers/register-unbound.js.es6 b/app/assets/javascripts/discourse/helpers/register-unbound.js.es6
new file mode 100644
index 00000000000..5e356f892e1
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/register-unbound.js.es6
@@ -0,0 +1,26 @@
+function registerUnbound(name, fn) {
+  Handlebars.registerHelper(name, function(property, options) {
+
+    if (options.types[0] === "ID") {
+      property = options.data.view.getStream(property).value();
+    }
+
+    var params = {},
+        hash = options.hash;
+
+    if (hash) {
+      Ember.keys(options.hash).forEach(function(k) {
+        var type = options.hashTypes[k];
+        if (type === "STRING") {
+          params[k] = hash[k];
+        } else if (type === "ID") {
+          params[k] = options.data.view.getStream(hash[k]).value();
+        }
+      });
+    }
+
+    return fn(property, params);
+  });
+}
+
+export default registerUnbound;
diff --git a/app/assets/javascripts/discourse/helpers/topic-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-link.js.es6
index fcbeaeb350a..4af28e7c6be 100644
--- a/app/assets/javascripts/discourse/helpers/topic-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/topic-link.js.es6
@@ -1,6 +1,6 @@
-Handlebars.registerHelper('topic-link', function(property, options) {
-  var topic = Ember.Handlebars.get(this, property, options),
-      title = topic.get('fancy_title');
+import registerUnbound from 'discourse/helpers/register-unbound';
 
+registerUnbound('topic-link', function(topic) {
+  var title = topic.get('fancy_title');
   return new Handlebars.SafeString("<a href='" + topic.get('lastUnreadUrl') + "' class='title'>" + title + "</a>");
 });
diff --git a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6 b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
index 95a220b542b..61448048122 100644
--- a/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-avatar.js.es6
@@ -1,3 +1,5 @@
+import registerUnbound from 'discourse/helpers/register-unbound';
+
 export function renderAvatar(user, options) {
   options = options || {};
 
@@ -39,9 +41,6 @@ export function renderAvatar(user, options) {
   }
 }
 
-Handlebars.registerHelper('avatar', function(user, options) {
-  if (typeof user === 'string') {
-    user = Ember.Handlebars.get(this, user, options);
-  }
-  return new Handlebars.SafeString(renderAvatar.call(this, user, options.hash));
+registerUnbound('avatar', function(user, params) {
+  return new Handlebars.SafeString(renderAvatar.call(this, user, params));
 });
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
index 1cd3fbc1ca7..f831ebf7862 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
@@ -17,34 +17,34 @@
       </thead>
 
       <tbody>
-        {{#each topics}}
-          <tr {{bind-attr class="archived"}}>
+        {{#each t in topics}}
+          <tr {{bind-attr class="t.archived"}}>
             <td class='main-link'>
-              {{topic-status topic=this}}
-              <a class='title' href="{{unbound lastUnreadUrl}}">{{{unbound fancy_title}}}</a>
-              {{topic-post-badges unread=unread
-                                  newPosts=new_posts
-                                  unseen=unseen
-                                  url=lastUnreadUrl}}
+              {{topic-status topic=t}}
+              <a class='title' href="{{unbound t.lastUnreadUrl}}">{{{unbound t.fancy_title}}}</a>
+              {{topic-post-badges unread=t.unread
+                                  newPosts=t.new_posts
+                                  unseen=t.unseen
+                                  url=t.lastUnreadUrl}}
             </td>
 
-            {{raw "list/category-column" hideCategory=controller.hideCategory category=category}}
+            {{raw "list/category-column" hideCategory=controller.hideCategory category=t.category}}
 
-            {{posts-count-column topic=this class="num" action="clickedPosts"}}
+            {{posts-count-column topic=t class="num" action="clickedPosts"}}
 
             {{#if controller.showParticipants}}
               <td class='participants'>
-                {{#each participants}}
-                <a href="{{unbound user.path}}" data-user-card="{{unbound user.username}}" class="{{unbound extras}}">{{avatar this usernamePath="user.username" imageSize="small"}}</a>
+                {{#each p in t.participants}}
+                <a href="{{unbound p.user.path}}" data-user-card="{{unbound p.user.username}}" class="{{unbound p.extras}}">{{avatar p usernamePath="user.username" imageSize="small"}}</a>
                 {{/each}}
               </td>
             {{/if}}
 
-            <td {{bind-attr class=":num :views viewsHeat"}}>
-              {{number views numberKey="views_long"}}
+            <td {{bind-attr class=":num :views t.viewsHeat"}}>
+              {{number t.views numberKey="views_long"}}
             </td>
 
-            {{raw "list/activity-column" topic=this class="num" tagName="td"}}
+            {{raw "list/activity-column" topic=t class="num" tagName="td"}}
           </tr>
         {{/each}}
       </tbody>
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index 82ad64c58ff..23878a1a541 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -64,7 +64,7 @@
         </tr>
       </thead>
       <tbody>
-        {{each topics itemController="topic-list-item" itemView="topic-list-item"}}
+        {{each content in topics itemController="topic-list-item" itemView="topic-list-item"}}
       </tbody>
     </table>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/group/index.hbs b/app/assets/javascripts/discourse/templates/group/index.hbs
index aee834721e6..bf99e6fddc7 100644
--- a/app/assets/javascripts/discourse/templates/group/index.hbs
+++ b/app/assets/javascripts/discourse/templates/group/index.hbs
@@ -3,7 +3,7 @@
     <div class='item'>
       <div class='clearfix info'>
         {{#link-to 'user' user class="avatar-link"}}<div class='avatar-wrapper'>{{avatar user imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div>{{/link-to}}
-        <span class='time'>{{format-date path="created_at" leaveAgo="true"}}</span>
+        <span class='time'>{{format-date created_at leaveAgo="true"}}</span>
         <span class="title">
           <a href="{{unbound url}}">{{unbound title}}</a>
         </span>
diff --git a/app/assets/javascripts/discourse/templates/modal/modal.hbs b/app/assets/javascripts/discourse/templates/modal/modal.hbs
index e52ad63b138..b7340453c78 100644
--- a/app/assets/javascripts/discourse/templates/modal/modal.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/modal.hbs
@@ -11,10 +11,10 @@
 
       {{outlet "modalBody"}}
 
-      {{#each errors}}
+      {{#each error in errors}}
         <div class="alert alert-error">
           <button class="close" data-dismiss="alert">×</button>
-          {{this}}
+          {{error}}
         </div>
       {{/each}}
 
diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/templates/user-card.hbs
index de62551daa3..0274f04dd7b 100644
--- a/app/assets/javascripts/discourse/templates/user-card.hbs
+++ b/app/assets/javascripts/discourse/templates/user-card.hbs
@@ -58,15 +58,15 @@
 
   {{#if user}}
     <div class="metadata">
-      <h3><span class='desc'>{{i18n 'last_post'}}</span> {{format-date path="user.last_posted_at" leaveAgo="true"}}</h3>
-      <h3><span class='desc'>{{i18n 'joined'}}</span> {{format-date path="user.created_at" leaveAgo="true"}}</h3>
+      <h3><span class='desc'>{{i18n 'last_post'}}</span> {{format-date user.last_posted_at leaveAgo="true"}}</h3>
+      <h3><span class='desc'>{{i18n 'joined'}}</span> {{format-date user.created_at leaveAgo="true"}}</h3>
     </div>
   {{/if}}
 
   {{#if showBadges}}
     <div class="badge-section">
-      {{#each user.featured_user_badges}}
-        {{user-badge badge=badge}}
+      {{#each ub in user.featured_user_badges}}
+        {{user-badge badge=ub.badge}}
       {{/each}}
       {{#if showMoreBadges}}
         {{#link-to 'user.badges' user class="btn more-user-badges"}}
diff --git a/app/assets/javascripts/discourse/templates/user/badges.hbs b/app/assets/javascripts/discourse/templates/user/badges.hbs
index 897e46c3f74..60e5b3e5632 100644
--- a/app/assets/javascripts/discourse/templates/user/badges.hbs
+++ b/app/assets/javascripts/discourse/templates/user/badges.hbs
@@ -1,5 +1,5 @@
 <section class='user-content user-badges-list'>
-  {{#each}}
-    {{user-badge badge=badge count=count}}
+  {{#each ub in model}}
+    {{user-badge badge=ub.badge count=ub.count}}
   {{/each}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index 1fe55c95f65..e1e51542b34 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -14,11 +14,11 @@
   </div>
 {{/if}}
 
-{{#each itemController="notification"}}
-  <div {{bind-attr class=":item :notification read::unread"}}>
-    {{notification-item notification=this scope=scope}}
+{{#each n in model itemController="notification"}}
+  <div {{bind-attr class=":item :notification read::n.unread"}}>
+    {{notification-item notification=n scope=n.scope}}
     <span class="time">
-      {{format-date path="created_at" leaveAgo="true"}}
+      {{format-date n.created_at leaveAgo="true"}}
     </span>
   </div>
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/user/posts.hbs b/app/assets/javascripts/discourse/templates/user/posts.hbs
index 4dc27bb7d6c..6645e640a5f 100644
--- a/app/assets/javascripts/discourse/templates/user/posts.hbs
+++ b/app/assets/javascripts/discourse/templates/user/posts.hbs
@@ -7,7 +7,7 @@
         </div>
       </a>
       <span class="time">
-        {{format-date path="created_at" leaveAgo="true"}}
+        {{format-date created_at leaveAgo="true"}}
       </span>
       <span class="title">
         <a href="{{unbound url}}">{{unbound topic_title}}</a>
@@ -17,7 +17,7 @@
       </span>
       {{#if deleted}}
         <span class="delete-info">
-          <i class="fa fa-trash-o"></i> {{avatar deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{format-date path="deleted_at" leaveAgo="true"}}
+          <i class="fa fa-trash-o"></i> {{avatar deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{format-date deleted_at leaveAgo="true"}}
         </span>
       {{/if}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index ccb0df55747..0d1f07c2f74 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -1,25 +1,25 @@
-{{#each model.content}}
-  <div {{bind-attr class=":item hidden deleted moderator_action"}}>
+{{#each item in model.content}}
+  <div {{bind-attr class=":item item.hidden item.deleted item.moderator_action"}}>
     <div class='clearfix info'>
-      <a href="{{unbound userUrl}}" data-user-card="{{unbound username}}" class='avatar-link'><div class='avatar-wrapper'>{{avatar this imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
-      <span class='time'>{{format-date path="created_at"}}</span>
+      <a href="{{unbound item.userUrl}}" data-user-card="{{unbound item.username}}" class='avatar-link'><div class='avatar-wrapper'>{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
+      <span class='time'>{{format-date item.created_at}}</span>
       <span class="title">
-        <a href="{{unbound postUrl}}">{{unbound title}}</a>
+        <a href="{{unbound item.postUrl}}">{{unbound item.title}}</a>
       </span>
-      <span class="category">{{category-link category}}</span>
+      <span class="category">{{category-link item.category}}</span>
     </div>
-    <p class='excerpt'>{{{unbound excerpt}}}</p>
-    {{#each children}}
+    <p class='excerpt'>{{{unbound item.excerpt}}}</p>
+    {{#each child in item.children}}
       <div class='child-actions'>
-        <i class="icon {{unbound icon}}"></i>
-        {{#each items}}
-          {{#if removableBookmark}}
-            <button class="btn btn-default remove-bookmark" {{action "removeBookmark" this}}>
+        <i class="icon {{unbound child.icon}}"></i>
+        {{#each grandChild in child.items}}
+          {{#if grandChild.removableBookmark}}
+            <button class="btn btn-default remove-bookmark" {{action "removeBookmark" grandChild}}>
               {{fa-icon 'times'}} {{i18n "bookmarks.remove"}}
             </button>
           {{/if}}
-          <a href="{{unbound userUrl}}" data-user-card="{{unbound username}}" class='avatar-link'><div class='avatar-wrapper'>{{avatar this imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}</div></a>
-          {{#if edit_reason}} &mdash; <span class="edit-reason">{{unbound edit_reason}}</span>{{/if}}
+          <a href="{{unbound grandChild.userUrl}}" data-user-card="{{unbound grandChild.username}}" class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}</div></a>
+          {{#if grandChild.edit_reason}} &mdash; <span class="edit-reason">{{unbound grandChild.edit_reason}}</span>{{/if}}
         {{/each}}
       </div>
     {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs
index 3f60aa31242..1d5731b3d9b 100644
--- a/app/assets/javascripts/discourse/templates/user/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user/user.hbs
@@ -121,8 +121,8 @@
           {{#if custom_groups}}
             <dt>{{i18n 'groups.title' count=custom_groups.length}}</dt>
             <dd class='groups'>
-              {{#each custom_groups}}
-                <span>{{#link-to 'group' this class="group-link"}}{{name}}{{/link-to}}</span>
+              {{#each group in custom_groups}}
+                <span>{{#link-to 'group' group class="group-link"}}{{group.name}}{{/link-to}}</span>
               {{/each}}
             </dd>
           {{/if}}
diff --git a/app/assets/javascripts/env.js b/app/assets/javascripts/env.js
index 5229641f04b..e3035e26230 100644
--- a/app/assets/javascripts/env.js
+++ b/app/assets/javascripts/env.js
@@ -1,9 +1,4 @@
-
-// These will help us migrate up to the new ember's default behavior
-window.ENV = {
-  MANDATORY_SETTER: false,
-  FEATURES: {'query-params-new': true}
-};
+window.ENV = { };
 
 window.Discourse = {};
 Discourse.SiteSettings = {};
diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js
index 6e3ca4c7d39..a94e7b150be 100644
--- a/app/assets/javascripts/main_include.js
+++ b/app/assets/javascripts/main_include.js
@@ -1,3 +1,4 @@
+//= require ./discourse/helpers/register-unbound
 //= require ./discourse/helpers/i18n_helpers
 //= require ./discourse/mixins/ajax
 //= require ./discourse
diff --git a/lib/freedom_patches/better_handlebars_errors.rb b/lib/freedom_patches/better_handlebars_errors.rb
new file mode 100644
index 00000000000..0f41bd27810
--- /dev/null
+++ b/lib/freedom_patches/better_handlebars_errors.rb
@@ -0,0 +1,16 @@
+module Ember
+  module Handlebars
+    class Template < Tilt::Template
+
+      # Wrap in an IIFE in development mode to get the correct filename
+      def compile_ember_handlebars(string)
+        if ::Rails.env.development?
+          "(function() { try { return Ember.Handlebars.compile(#{indent(string).inspect}); } catch(err) { throw err; } })()"
+        else
+          "Handlebars.compile(#{indent(string).inspect});"
+        end
+      end
+    end
+  end
+end
+
diff --git a/vendor/assets/javascripts/development/ember.js b/vendor/assets/javascripts/development/ember.js
index e8b57d0adc7..3ec5c65c122 100644
--- a/vendor/assets/javascripts/development/ember.js
+++ b/vendor/assets/javascripts/development/ember.js
@@ -5,7 +5,7 @@
  *            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.9.0
  */
 
 (function() {
@@ -14,6 +14,7 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
 (function() {
   Ember = this.Ember = this.Ember || {};
   if (typeof Ember === 'undefined') { Ember = {}; };
+  function UNDEFINED() { }
 
   if (typeof Ember.__loader === 'undefined') {
     var registry = {}, seen = {};
@@ -23,7 +24,11 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
     };
 
     requirejs = eriuqer = requireModule = function(name) {
-      if (seen.hasOwnProperty(name)) { return seen[name]; }
+      var s = seen[name];
+
+      if (s !== undefined) { return seen[name]; }
+      if (s === UNDEFINED) { return undefined;  }
+
       seen[name] = {};
 
       if (!registry[name]) {
@@ -35,34 +40,37 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
       var callback = mod.callback;
       var reified = [];
       var exports;
+      var length = deps.length;
 
-      for (var i=0, l=deps.length; i<l; i++) {
+      for (var i=0; i<length; i++) {
         if (deps[i] === 'exports') {
           reified.push(exports = {});
         } else {
-          reified.push(requireModule(resolve(deps[i])));
+          reified.push(requireModule(resolve(deps[i], name)));
         }
       }
 
-      var value = callback.apply(this, reified);
-      return seen[name] = exports || value;
+      var value = length === 0 ? callback.call(this) : callback.apply(this, reified);
 
-      function resolve(child) {
-        if (child.charAt(0) !== '.') { return child; }
-        var parts = child.split("/");
-        var parentBase = name.split("/").slice(0, -1);
-
-        for (var i=0, l=parts.length; i<l; i++) {
-          var part = parts[i];
-
-          if (part === '..') { parentBase.pop(); }
-          else if (part === '.') { continue; }
-          else { parentBase.push(part); }
-        }
-
-        return parentBase.join("/");
-      }
+      return seen[name] = exports || (value === undefined ? UNDEFINED : value);
     };
+
+    function resolve(child, name) {
+      if (child.charAt(0) !== '.') { return child; }
+      var parts = child.split("/");
+      var parentBase = name.split("/").slice(0, -1);
+
+      for (var i=0, l=parts.length; i<l; i++) {
+        var part = parts[i];
+
+        if (part === '..') { parentBase.pop(); }
+        else if (part === '.') { continue; }
+        else { parentBase.push(part); }
+      }
+
+      return parentBase.join("/");
+    }
+
     requirejs._eak_seen = registry;
 
     Ember.__loader = {define: enifed, require: eriuqer, registry: registry};
@@ -193,6 +201,23 @@ enifed("backburner",
         }
       },
 
+      join: function(target, method /*, args */) {
+        if (this.currentInstance) {
+          if (!method) {
+            method = target;
+            target = null;
+          }
+
+          if (isString(method)) {
+            method = target[method];
+          }
+
+          return method.apply(target, slice.call(arguments, 2));
+        } else {
+          return this.run.apply(this, arguments);
+        }
+      },
+
       defer: function(queueName, target, method /* , args */) {
         if (!method) {
           method = target;
@@ -640,11 +665,10 @@ enifed("backburner/deferred-action-queues",
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var each = __dependency1__.each;
-    var isString = __dependency1__.isString;
     var Queue = __dependency2__["default"];
 
     function DeferredActionQueues(queueNames, options) {
-      var queues = this.queues = {};
+      var queues = this.queues = Object.create(null);
       this.queueNames = queueNames = queueNames || [];
 
       this.options = options;
@@ -663,7 +687,9 @@ enifed("backburner/deferred-action-queues",
         var queues = this.queues;
         var queue = queues[name];
 
-        if (!queue) { noSuchQueue(name); }
+        if (!queue) {
+          noSuchQueue(name);
+        }
 
         if (onceFlag) {
           return queue.pushUnique(target, method, args, stack);
@@ -672,26 +698,6 @@ enifed("backburner/deferred-action-queues",
         }
       },
 
-      invoke: function(target, method, args, _, _errorRecordedForStack) {
-        if (args && args.length > 0) {
-          method.apply(target, args);
-        } else {
-          method.call(target);
-        }
-      },
-
-      invokeWithOnError: function(target, method, args, onError, errorRecordedForStack) {
-        try {
-          if (args && args.length > 0) {
-            method.apply(target, args);
-          } else {
-            method.call(target);
-          }
-        } catch(error) {
-          onError(error, errorRecordedForStack);
-        }
-      },
-
       flush: function() {
         var queues = this.queues;
         var queueNames = this.queueNames;
@@ -699,85 +705,23 @@ enifed("backburner/deferred-action-queues",
         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;
 
         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 numberOfQueueItems = queue._queue.length;
 
-          if (numberOfQueueItems && before) {
-            before();
-          }
-
-          while (queueIndex < numberOfQueueItems) {
-            target                = queueItems[queueIndex];
-            method                = queueItems[queueIndex+1];
-            args                  = queueItems[queueIndex+2];
-            errorRecordedForStack = queueItems[queueIndex+3]; // Debugging assistance
-
-            //
-
-            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);
-            }
-
-            queueIndex += 4;
-          }
-
-          queue._queueBeingFlushed = null;
-          if (numberOfQueueItems && after) {
-            after();
-          }
-
-          if ((priorQueueNameIndex = indexOfPriorQueueWithActions(this, queueNameIndex)) !== -1) {
-            queueNameIndex = priorQueueNameIndex;
-          } else {
+          if (numberOfQueueItems === 0) {
             queueNameIndex++;
+          } else {
+            queue.flush(false /* async */);
+            queueNameIndex = 0;
           }
         }
       }
     };
 
-    function indexOfPriorQueueWithActions(daq, currentQueueIndex) {
-      var queueName, queue;
-
-      for (var i = 0, l = currentQueueIndex; i <= l; i++) {
-        queueName = daq.queueNames[i];
-        queue = daq.queues[queueName];
-        if (queue._queue.length) { return i; }
-      }
-
-      return -1;
-    }
-
     __exports__["default"] = DeferredActionQueues;
   });
 enifed("backburner/platform",
@@ -795,9 +739,11 @@ enifed("backburner/platform",
     __exports__.needsIETryCatchFix = needsIETryCatchFix;
   });
 enifed("backburner/queue",
-  ["exports"],
-  function(__exports__) {
+  ["./utils","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
+    var isString = __dependency1__.isString;
+
     function Queue(name, options, globalOptions) {
       this.name = name;
       this.globalOptions = globalOptions || {};
@@ -895,56 +841,89 @@ enifed("backburner/queue",
         };
       },
 
-      // TODO: remove me, only being used for Ember.run.sync
-      flush: function() {
+      invoke: function(target, method, args, _, _errorRecordedForStack) {
+        if (args && args.length > 0) {
+          method.apply(target, args);
+        } else {
+          method.call(target);
+        }
+      },
+
+      invokeWithOnError: function(target, method, args, onError, errorRecordedForStack) {
+        try {
+          if (args && args.length > 0) {
+            method.apply(target, args);
+          } else {
+            method.call(target);
+          }
+        } catch(error) {
+          onError(error, errorRecordedForStack);
+        }
+      },
+
+      flush: function(sync) {
         var queue = this._queue;
+        var length = queue.length;
+
+        if (length === 0) {
+          return;
+        }
+
         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;
+        var onError = globalOptions.onError || (globalOptions.onErrorTarget &&
+                                                globalOptions.onErrorTarget[globalOptions.onErrorMethod]);
+        var target, method, args, errorRecordedForStack;
+        var invoke = onError ? this.invokeWithOnError : this.invoke;
 
         this.targetQueues = Object.create(null);
+        var queueItems = this._queueBeingFlushed = this._queue.slice();
+        this._queue = [];
 
-        if (l && before) { before(); }
-        for (i = 0; i < l; i += 4) {
-          target = queue[i];
-          method = queue[i+1];
-          args   = queue[i+2];
-          stack  = queue[i+3]; // Debugging assistance
+        if (before) {
+          before();
+        }
 
-          // TODO: error handling
-          if (args && args.length > 0) {
-            if (onError) {
-              try {
-                method.apply(target, args);
-              } catch (e) {
-                onError(e);
-              }
-            } else {
-              method.apply(target, args);
-            }
-          } else {
-            if (onError) {
-              try {
-                method.call(target);
-              } catch(e) {
-                onError(e);
-              }
-            } else {
-              method.call(target);
-            }
+        for (var i = 0; i < length; i += 4) {
+          target                = queueItems[i];
+          method                = queueItems[i+1];
+          args                  = queueItems[i+2];
+          errorRecordedForStack = queueItems[i+3]; // Debugging assistance
+
+          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);
           }
         }
-        if (l && after) { after(); }
 
-        // check if new items have been added
-        if (queue.length > l) {
-          this._queue = queue.slice(l);
-          this.flush();
-        } else {
-          this._queue.length = 0;
+        if (after) {
+          after();
+        }
+
+        this._queueBeingFlushed = undefined;
+
+        if (sync !== false &&
+            this._queue.length > 0) {
+          // check if new items have been added
+          this.flush(true);
         }
       },
 
@@ -980,9 +959,11 @@ enifed("backburner/queue",
         // if not found in current queue
         // could be in the queue that is being flushed
         queue = this._queueBeingFlushed;
+
         if (!queue) {
           return;
         }
+
         for (i = 0, l = queue.length; i < l; i += 4) {
           currentTarget = queue[i];
           currentMethod = queue[i+1];
@@ -1222,20 +1203,6 @@ enifed("container/container",
         return container;
       },
 
-      /**
-        Sets a key-value pair on the current container. If a parent container,
-        has the same key, once set on a child, the parent and child will diverge
-        as expected.
-
-        @method set
-        @param {Object} object
-        @param {String} key
-        @param {any} value
-      */
-      set: function(object, key, value) {
-        object[key] = value;
-      },
-
       /**
         Registers a factory for later injection.
 
@@ -1491,11 +1458,13 @@ enifed("container/container",
 
       /**
         @method options
-        @param {String} type
+        @param {String} fullName
         @param {Object} options
       */
-      options: function(type, options) {
-        this.optionsForType(type, options);
+      options: function(fullName, options) {
+        options = options || {};
+        var normalizedName = this.normalize(fullName);
+        this._options[normalizedName] = options;
       },
 
       /**
@@ -1540,7 +1509,10 @@ enifed("container/container",
 
         var fullNameType = fullName.split(':')[0];
         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.');
+          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);
@@ -1604,9 +1576,13 @@ enifed("container/container",
         var normalizedName = this.normalize(fullName);
 
         if (this.cache[normalizedName]) {
-          throw new Error("Attempted to register an injection for a type that has already been looked up. ('" + normalizedName + "', '" + property + "', '" + injectionName + "')");
+          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);
+
+        addInjection(initRules(this.injections, normalizedName), property, normalizedInjectionName);
       },
 
 
@@ -1713,7 +1689,7 @@ enifed("container/container",
             'been looked up. (\'' + normalizedName + '\', \'' + property + '\', \'' + injectionName + '\')');
         }
 
-        addInjection(this.factoryInjections, normalizedName, property, normalizedInjectionName);
+        addInjection(initRules(this.factoryInjections, normalizedName), property, normalizedInjectionName);
       },
 
       /**
@@ -1764,7 +1740,7 @@ enifed("container/container",
         return true;
       }
 
-      return !!container.resolve(fullName);
+      return container.resolve(fullName) !== undefined;
     }
 
     function lookup(container, fullName, options) {
@@ -1800,22 +1776,32 @@ enifed("container/container",
 
       if (!injections) { return hash; }
 
-      var injection, injectable;
+      validateInjections(container, injections);
+
+      var injection;
 
       for (var i = 0, length = injections.length; i < length; i++) {
         injection = injections[i];
-        injectable = lookup(container, injection.fullName);
-
-        if (injectable !== undefined) {
-          hash[injection.property] = injectable;
-        } else {
-          throw new Error('Attempting to inject an unknown injection: `' + injection.fullName + '`');
-        }
+        hash[injection.property] = lookup(container, injection.fullName);
       }
 
       return hash;
     }
 
+    function validateInjections(container, injections) {
+      if (!injections) { return; }
+
+      var fullName;
+
+      for (var i = 0, length = injections.length; i < length; i++) {
+        fullName = injections[i].fullName;
+
+        if (!container.has(fullName)) {
+          throw new Error('Attempting to inject an unknown injection: `' + fullName + '`');
+        }
+      }
+    }
+
     function option(container, fullName, optionName) {
       var options = container._options[fullName];
 
@@ -1889,8 +1875,23 @@ enifed("container/container",
       return factoryInjections;
     }
 
+    function normalizeInjectionsHash(hash) {
+      var injections = [];
+
+      for (var key in hash) {
+        if (hash.hasOwnProperty(key)) {
+          Ember.assert("Expected a proper full name, given '" + hash[key] + "'", validateFullName(hash[key]));
+
+          addInjection(injections, key, hash[key]);
+        }
+      }
+
+      return injections;
+    }
+
     function instantiate(container, fullName) {
       var factory = factoryFor(container, fullName);
+      var lazyInjections;
 
       if (option(container, fullName, 'instantiate') === false) {
         return factory;
@@ -1902,6 +1903,7 @@ enifed("container/container",
             'Most likely an improperly defined class or an invalid module export.');
         }
 
+        
         if (typeof factory.extend === 'function') {
           // assume the factory was extendable and is already injected
           return factory.create();
@@ -1959,8 +1961,11 @@ enifed("container/container",
       return true;
     }
 
-    function addInjection(rules, factoryName, property, injectionName) {
-      var injections = rules[factoryName] = rules[factoryName] || [];
+    function initRules(rules, factoryName) {
+      return rules[factoryName] || (rules[factoryName] = []);
+    }
+
+    function addInjection(injections, property, injectionName) {
       injections.push({
         property: property,
         fullName: injectionName
@@ -1969,9 +1974,208 @@ enifed("container/container",
 
     __exports__["default"] = Container;
   });
+enifed("dag-map",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    function visit(vertex, fn, visited, path) {
+      var name = vertex.name;
+      var vertices = vertex.incoming;
+      var names = vertex.incomingNames;
+      var len = names.length;
+      var i;
+
+      if (!visited) {
+        visited = {};
+      }
+      if (!path) {
+        path = [];
+      }
+      if (visited.hasOwnProperty(name)) {
+        return;
+      }
+      path.push(name);
+      visited[name] = true;
+      for (i = 0; i < len; i++) {
+        visit(vertices[names[i]], fn, visited, path);
+      }
+      fn(vertex, path);
+      path.pop();
+    }
+
+
+    /**
+     * DAG stands for Directed acyclic graph.
+     *
+     * It is used to build a graph of dependencies checking that there isn't circular
+     * dependencies. p.e Registering initializers with a certain precedence order.
+     *
+     * @class DAG
+     * @constructor
+     */
+    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;
+    }
+
+    /**
+     * Adds a vertex entry to the graph unless it is already added.
+     *
+     * @private
+     * @method add
+     * @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) {
+        return this.vertices[name];
+      }
+      var vertex = new Vertex(name);
+      this.vertices[name] = vertex;
+      this.names.push(name);
+      return vertex;
+    };
+
+    /**
+     * Adds a vertex to the graph and sets its value.
+     *
+     * @private
+     * @method map
+     * @param {String} name The name of the vertex.
+     * @param         value The value to put in the vertex.
+     */
+    DAG.prototype.map = function(name, value) {
+      this.add(name).value = value;
+    };
+
+    /**
+     * Connects the vertices with the given names, adding them to the graph if
+     * necessary, only if this does not produce is any circular dependency.
+     *
+     * @private
+     * @method addEdge
+     * @param {String} fromName The name the vertex where the edge starts.
+     * @param {String} toName The name the vertex where the edge ends.
+     */
+    DAG.prototype.addEdge = function(fromName, toName) {
+      if (!fromName || !toName || fromName === toName) {
+        return;
+      }
+      var from = this.add(fromName);
+      var to = this.add(toName);
+      if (to.incoming.hasOwnProperty(fromName)) {
+        return;
+      }
+      function checkCycle(vertex, path) {
+        if (vertex.name === toName) {
+          throw new Error("cycle detected: " + toName + " <- " + path.join(" <- "));
+        }
+      }
+      visit(from, checkCycle);
+      from.hasOutgoing = true;
+      to.incoming[fromName] = from;
+      to.incomingNames.push(fromName);
+    };
+
+    /**
+     * Visits all the vertex of the graph calling the given function with each one,
+     * ensuring that the vertices are visited respecting their precedence.
+     *
+     * @method  topsort
+     * @param {Function} fn The function to be invoked on each vertex.
+     */
+    DAG.prototype.topsort = function(fn) {
+      var visited = {};
+      var vertices = this.vertices;
+      var names = this.names;
+      var len = names.length;
+      var i, vertex;
+
+      for (i = 0; i < len; i++) {
+        vertex = vertices[names[i]];
+        if (!vertex.hasOutgoing) {
+          visit(vertex, fn, visited);
+        }
+      }
+    };
+
+    /**
+     * Adds a vertex with the given name and value to the graph and joins it with the
+     * vertices referenced in _before_ and _after_. If there isn't vertices with those
+     * names, they are added too.
+     *
+     * If either _before_ or _after_ are falsy/empty, the added vertex will not have
+     * an incoming/outgoing edge.
+     *
+     * @method addEdges
+     * @param {String} name The name of the vertex to be added.
+     * @param         value The value of that vertex.
+     * @param        before An string or array of strings with the names of the vertices before
+     *                      which this vertex must be visited.
+     * @param         after An string or array of strings with the names of the vertex after
+     *                      which this vertex must be visited.
+     *
+     */
+    DAG.prototype.addEdges = function(name, value, before, after) {
+      var i;
+      this.map(name, value);
+      if (before) {
+        if (typeof before === 'string') {
+          this.addEdge(name, before);
+        } else {
+          for (i = 0; i < before.length; i++) {
+            this.addEdge(name, before[i]);
+          }
+        }
+      }
+      if (after) {
+        if (typeof after === 'string') {
+          this.addEdge(after, name);
+        } else {
+          for (i = 0; i < after.length; i++) {
+            this.addEdge(after[i], name);
+          }
+        }
+      }
+    };
+
+    __exports__["default"] = DAG;
+  });
+enifed("dag-map.umd",
+  ["./dag-map"],
+  function(__dependency1__) {
+    "use strict";
+    var DAG = __dependency1__["default"];
+
+    /* global define:true module:true window: true */
+    if (typeof enifed === 'function' && enifed.amd) {
+      enifed(function() { return DAG; });
+    } else if (typeof module !== 'undefined' && module.exports) {
+      module.exports = DAG;
+    } else if (typeof this !== 'undefined') {
+      this['DAG'] = DAG;
+    }
+  });
 enifed("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__) {
+  ["ember-metal/core","ember-runtime/system/lazy_load","ember-application/system/resolver","ember-application/system/application","ember-application/ext/controller"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var runLoadHooks = __dependency2__.runLoadHooks;
@@ -1984,22 +2188,20 @@ enifed("ember-application",
     @requires ember-views, ember-routing
     */
 
-    var DAG = __dependency3__["default"];
-    var Resolver = __dependency4__.Resolver;
-    var DefaultResolver = __dependency4__["default"];
-    var Application = __dependency5__["default"];
+    var Resolver = __dependency3__.Resolver;
+    var DefaultResolver = __dependency3__["default"];
+    var Application = __dependency4__["default"];
     // side effect of extending ControllerMixin
 
     Ember.Application = Application;
-    Ember.DAG = DAG;
     Ember.Resolver = Resolver;
     Ember.DefaultResolver = DefaultResolver;
 
     runLoadHooks('Ember.Application', Application);
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/property_get","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__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -2009,13 +2211,12 @@ enifed("ember-application/ext/controller",
     var Ember = __dependency1__["default"];
     // Ember.assert
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var EmberError = __dependency4__["default"];
-    var inspect = __dependency5__.inspect;
-    var computed = __dependency6__.computed;
-    var ControllerMixin = __dependency7__["default"];
-    var meta = __dependency5__.meta;
-    var controllerFor = __dependency8__["default"];
+    var EmberError = __dependency3__["default"];
+    var inspect = __dependency4__.inspect;
+    var computed = __dependency5__.computed;
+    var ControllerMixin = __dependency6__["default"];
+    var meta = __dependency4__.meta;
+    var controllerFor = __dependency7__["default"];
 
     function verifyNeedsDependencies(controller, container, needs) {
       var dependency, i, l;
@@ -2024,7 +2225,8 @@ enifed("ember-application/ext/controller",
       for (i=0, l=needs.length; i<l; i++) {
         dependency = needs[i];
 
-        Ember.assert(inspect(controller) + "#needs must not specify dependencies with periods in their names (" + dependency + ")", dependency.indexOf('.') === -1);
+        Ember.assert(inspect(controller) + "#needs must not specify dependencies with periods in their names (" +
+                     dependency + ")", dependency.indexOf('.') === -1);
 
         if (dependency.indexOf(':') === -1) {
           dependency = "controller:" + dependency;
@@ -2036,7 +2238,8 @@ enifed("ember-application/ext/controller",
         }
       }
       if (missing.length) {
-        throw new EmberError(inspect(controller) + " needs [ " + missing.join(', ') + " ] but " + (missing.length > 1 ? 'they' : 'it') + " could not be found");
+        throw new EmberError(inspect(controller) + " needs [ " + missing.join(', ') +
+                             " ] but " + (missing.length > 1 ? 'they' : 'it') + " could not be found");
       }
     }
 
@@ -2057,7 +2260,12 @@ enifed("ember-application/ext/controller",
             }
           }
 
-          var errorMessage = inspect(controller) + '#needs does not include `' + controllerName + '`. To access the ' + controllerName + ' controller from ' + inspect(controller) + ', ' + inspect(controller) + ' should have a `needs` property that is an array of the controllers it has access to.';
+          var errorMessage = inspect(controller) + '#needs does not include `' +
+                             controllerName + '`. To access the ' +
+                             controllerName + ' controller from ' +
+                             inspect(controller) + ', ' +
+                             inspect(controller) +
+                             ' should have a `needs` property that is an array of the controllers it has access to.';
           throw new ReferenceError(errorMessage);
         },
         setUnknownProperty: function (key, value) {
@@ -2178,34 +2386,34 @@ 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__) {
+  ["dag-map","container/container","ember-metal","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-runtime/system/namespace","ember-runtime/mixins/deferred","ember-application/system/resolver","ember-metal/platform","ember-metal/run_loop","ember-metal/utils","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-extension-support/container_debug_adapter","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__, __dependency29__, __exports__) {
     "use strict";
     /**
     @module ember
     @submodule ember-application
     */
+    var DAG = __dependency1__["default"];
+    var Container = __dependency2__["default"];
 
-    var Ember = __dependency1__["default"];
+
+    var Ember = __dependency3__["default"];
     // Ember.FEATURES, Ember.deprecate, Ember.assert, Ember.libraries, LOG_VERSION, Namespace, BOOTED
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var runLoadHooks = __dependency4__.runLoadHooks;
-    var DAG = __dependency5__["default"];
-    var Namespace = __dependency6__["default"];
-    var DeferredMixin = __dependency7__["default"];
-    var DefaultResolver = __dependency8__["default"];
-    var create = __dependency9__.create;
-    var run = __dependency10__["default"];
-    var canInvoke = __dependency11__.canInvoke;
-    var Container = __dependency12__["default"];
+    var get = __dependency4__.get;
+    var set = __dependency5__.set;
+    var runLoadHooks = __dependency6__.runLoadHooks;
+    var Namespace = __dependency7__["default"];
+    var DeferredMixin = __dependency8__["default"];
+    var DefaultResolver = __dependency9__["default"];
+    var create = __dependency10__.create;
+    var run = __dependency11__["default"];
+    var canInvoke = __dependency12__.canInvoke;
     var Controller = __dependency13__["default"];
     var EnumerableUtils = __dependency14__["default"];
     var ObjectController = __dependency15__["default"];
     var ArrayController = __dependency16__["default"];
     var SelectView = __dependency17__["default"];
     var EventDispatcher = __dependency18__["default"];
-    //import ContainerDebugAdapter from "ember-extension-support/container_debug_adapter";
     var jQuery = __dependency19__["default"];
     var Route = __dependency20__["default"];
     var Router = __dependency21__["default"];
@@ -2215,10 +2423,16 @@ enifed("ember-application/system/application",
     var NoneLocation = __dependency25__["default"];
     var BucketCache = __dependency26__["default"];
 
-    var K = __dependency27__.K;
-    var EmberHandlebars = __dependency28__["default"];
+    // this is technically incorrect (per @wycats)
+    // it should work properly with:
+    // `import ContainerDebugAdapter from 'ember-extension-support/container_debug_adapter';` but
+    // es6-module-transpiler 0.4.0 eagerly grabs the module (which is undefined)
+
+    var ContainerDebugAdapter = __dependency27__["default"];
+
+    var K = __dependency28__.K;
+    var EmberHandlebars = __dependency29__["default"];
 
-    var ContainerDebugAdapter;
     function props(obj) {
       var properties = [];
 
@@ -2290,10 +2504,10 @@ enifed("ember-application/system/application",
       names by setting the application's `customEvents` property:
 
       ```javascript
-      App = Ember.Application.create({
+      var App = Ember.Application.create({
         customEvents: {
           // add support for the paste event
-          paste: "paste"
+          paste: 'paste'
         }
       });
       ```
@@ -2307,7 +2521,7 @@ enifed("ember-application/system/application",
       should be delegated, set your application's `rootElement` property:
 
       ```javascript
-      window.App = Ember.Application.create({
+      var App = Ember.Application.create({
         rootElement: '#ember-app'
       });
       ```
@@ -2350,7 +2564,7 @@ enifed("ember-application/system/application",
       the `LOG_TRANSITIONS_INTERNAL` flag:
 
       ```javascript
-      window.App = Ember.Application.create({
+      var App = Ember.Application.create({
         LOG_TRANSITIONS: true, // basic logging of successful transitions
         LOG_TRANSITIONS_INTERNAL: true // detailed logging of all routing steps
       });
@@ -2419,10 +2633,10 @@ enifed("ember-application/system/application",
         corresponding view method name as the value. For example:
 
         ```javascript
-        App = Ember.Application.create({
+        var App = Ember.Application.create({
           customEvents: {
             // add support for the paste event
-            paste: "paste"
+            paste: 'paste'
           }
         });
         ```
@@ -2438,7 +2652,9 @@ enifed("ember-application/system/application",
       _readinessDeferrals: 1,
 
       init: function() {
-        if (!this.$) { this.$ = jQuery; }
+        if (!this.$) {
+          this.$ = jQuery;
+        }
         this.__container__ = this.buildContainer();
 
         this.Router = this.defaultRouter();
@@ -2550,10 +2766,11 @@ enifed("ember-application/system/application",
         Example:
 
         ```javascript
-        App = Ember.Application.create();
+        var App = Ember.Application.create();
+        
         App.deferReadiness();
-
-        jQuery.getJSON("/auth-token", function(token) {
+        // Ember.$ is a reference to the jQuery object/function
+        Ember.$.getJSON('/auth-token', function(token) {
           App.token = token;
           App.advanceReadiness();
         });
@@ -2599,7 +2816,8 @@ enifed("ember-application/system/application",
 
         ```javascript
         var App = Ember.Application.create();
-        App.Orange  = Ember.Object.extend();
+        
+        App.Orange = Ember.Object.extend();
         App.register('fruit:favorite', App.Orange);
         ```
 
@@ -2610,8 +2828,8 @@ enifed("ember-application/system/application",
         An example of registering a controller with a non-standard name:
 
         ```javascript
-        var App = Ember.Application.create(),
-            Session  = Ember.Controller.extend();
+        var App = Ember.Application.create();
+        var Session = Ember.Controller.extend();
 
         App.register('controller:session', Session);
 
@@ -2636,10 +2854,10 @@ enifed("ember-application/system/application",
         App.Email   = Ember.Object.extend();
         App.session = Ember.Object.create();
 
-        App.register('model:user', App.Person, {singleton: false });
+        App.register('model:user', App.Person, { singleton: false });
         App.register('fruit:favorite', App.Orange);
-        App.register('communication:main', App.Email, {singleton: false});
-        App.register('session', App.session, {instantiate: false});
+        App.register('communication:main', App.Email, { singleton: false });
+        App.register('session', App.session, { instantiate: false });
         ```
 
         @method register
@@ -2663,8 +2881,8 @@ enifed("ember-application/system/application",
         An example of providing a session object to all controllers:
 
         ```javascript
-        var App = Ember.Application.create(),
-            Session = Ember.Object.extend({ isAuthenticated: false });
+        var App = Ember.Application.create();
+        var Session = Ember.Object.extend({ isAuthenticated: false });
 
         // A factory must be registered before it can be injected
         App.register('session:main', Session);
@@ -2691,7 +2909,7 @@ enifed("ember-application/system/application",
         directly (via `create` or `new`) bypasses the dependency injection
         system.
 
-        Ember-Data instantiates its models in a unique manner, and consequently
+        **Note:** Ember-Data instantiates its models in a unique manner, and consequently
         injections onto models (or all models) will not work as expected. Injections
         on models can be enabled by setting `Ember.MODEL_FACTORY_INJECTIONS`
         to `true`.
@@ -2763,24 +2981,23 @@ enifed("ember-application/system/application",
         Typical Example:
 
         ```javascript
-
         var App;
 
         run(function() {
           App = Ember.Application.create();
         });
 
-        module("acceptance test", {
+        module('acceptance test', {
           setup: function() {
             App.reset();
           }
         });
 
-        test("first test", function() {
+        test('first test', function() {
           // App is freshly reset
         });
 
-        test("first test", function() {
+        test('second test', function() {
           // App is again freshly reset
         });
         ```
@@ -2792,14 +3009,13 @@ enifed("ember-application/system/application",
         to the app becoming ready.
 
         ```javascript
-
         var App;
 
         run(function() {
           App = Ember.Application.create();
         });
 
-        module("acceptance test", {
+        module('acceptance test', {
           setup: function() {
             run(function() {
               App.reset();
@@ -2808,12 +3024,13 @@ enifed("ember-application/system/application",
           }
         });
 
-        test("first test", function() {
+        test('first test', function() {
           ok(true, 'something before app is initialized');
 
           run(function() {
             App.advanceReadiness();
           });
+          
           ok(true, 'something after app is initialized');
         });
         ```
@@ -2849,7 +3066,7 @@ enifed("ember-application/system/application",
         var container = this.__container__;
         var graph = new DAG();
         var namespace = this;
-        var name, initializer;
+        var initializer;
 
         for (var i = 0; i < initializers.length; i++) {
           initializer = initializersByName[initializers[i]];
@@ -2982,8 +3199,9 @@ enifed("ember-application/system/application",
         ```javascript
         Ember.Application.initializer({
           name: 'namedInitializer',
+          
           initialize: function(container, application) {
-            Ember.debug("Running namedInitializer!");
+            Ember.debug('Running namedInitializer!');
           }
         });
         ```
@@ -2997,8 +3215,9 @@ enifed("ember-application/system/application",
         ```javascript
         Ember.Application.initializer({
           name: 'first',
+          
           initialize: function(container, application) {
-            Ember.debug("First initializer!");
+            Ember.debug('First initializer!');
           }
         });
 
@@ -3014,7 +3233,7 @@ enifed("ember-application/system/application",
           after: 'first',
 
           initialize: function(container, application) {
-            Ember.debug("Second initializer!");
+            Ember.debug('Second initializer!');
           }
         });
 
@@ -3031,7 +3250,7 @@ enifed("ember-application/system/application",
           before: 'first',
 
           initialize: function(container, application) {
-            Ember.debug("Pre initializer!");
+            Ember.debug('Pre initializer!');
           }
         });
 
@@ -3049,7 +3268,7 @@ enifed("ember-application/system/application",
           after: ['first', 'second'],
 
           initialize: function(container, application) {
-            Ember.debug("Post initializer!");
+            Ember.debug('Post initializer!');
           }
         });
 
@@ -3066,10 +3285,11 @@ enifed("ember-application/system/application",
 
         ```javascript
         Ember.Application.initializer({
-          name: "preload-data",
+          name: 'preload-data',
 
           initialize: function(container, application) {
             var store = container.lookup('store:main');
+            
             store.pushPayload(preloadedData);
           }
         });
@@ -3103,6 +3323,7 @@ enifed("ember-application/system/application",
 
         Ember.assert("The initializer '" + initializer.name + "' has already been registered", !this.initializers[initializer.name]);
         Ember.assert("An initializer cannot be registered without an initialize function", canInvoke(initializer, 'initialize'));
+        Ember.assert("An initializer cannot be registered without a name property", initializer.name !== undefined);
 
         this.initializers[initializer.name] = initializer;
       },
@@ -3182,8 +3403,6 @@ enifed("ember-application/system/application",
         container.injection('data-adapter:main', 'containerDebugAdapter', 'container-debug-adapter:main');
         // Custom resolver authors may want to register their own ContainerDebugAdapter with this key
 
-        // ES6TODO: resolve this via import once ember-application package is ES6'ed
-        if (!ContainerDebugAdapter) { ContainerDebugAdapter = requireModule('ember-extension-support/container_debug_adapter')['default']; }
         container.register('container-debug-adapter:main', ContainerDebugAdapter);
 
         return container;
@@ -3244,192 +3463,6 @@ enifed("ember-application/system/application",
 
     __exports__["default"] = Application;
   });
-enifed("ember-application/system/dag",
-  ["ember-metal/error","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var EmberError = __dependency1__["default"];
-
-    function visit(vertex, fn, visited, path) {
-      var name = vertex.name;
-      var vertices = vertex.incoming;
-      var names = vertex.incomingNames;
-      var len = names.length;
-      var i;
-
-      if (!visited) {
-        visited = {};
-      }
-      if (!path) {
-        path = [];
-      }
-      if (visited.hasOwnProperty(name)) {
-        return;
-      }
-      path.push(name);
-      visited[name] = true;
-      for (i = 0; i < len; i++) {
-        visit(vertices[names[i]], fn, visited, path);
-      }
-      fn(vertex, path);
-      path.pop();
-    }
-
-
-    /**
-     * DAG stands for Directed acyclic graph.
-     *
-     * It is used to build a graph of dependencies checking that there isn't circular
-     * dependencies. p.e Registering initializers with a certain precedence order.
-     *
-     * @class DAG
-     * @constructor
-     */
-    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;
-    }
-
-    /**
-     * Adds a vertex entry to the graph unless it is already added.
-     *
-     * @private
-     * @method add
-     * @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) {
-        return this.vertices[name];
-      }
-      var vertex = new Vertex(name);
-      this.vertices[name] = vertex;
-      this.names.push(name);
-      return vertex;
-    };
-
-    /**
-     * Adds a vertex to the graph and sets its value.
-     *
-     * @private
-     * @method map
-     * @param {String} name The name of the vertex.
-     * @param         value The value to put in the vertex.
-     */
-    DAG.prototype.map = function(name, value) {
-      this.add(name).value = value;
-    };
-
-    /**
-     * Connects the vertices with the given names, adding them to the graph if
-     * necessary, only if this does not produce is any circular dependency.
-     *
-     * @private
-     * @method addEdge
-     * @param {String} fromName The name the vertex where the edge starts.
-     * @param {String} toName The name the vertex where the edge ends.
-     */
-    DAG.prototype.addEdge = function(fromName, toName) {
-      if (!fromName || !toName || fromName === toName) {
-        return;
-      }
-      var from = this.add(fromName);
-      var to = this.add(toName);
-      if (to.incoming.hasOwnProperty(fromName)) {
-        return;
-      }
-      function checkCycle(vertex, path) {
-        if (vertex.name === toName) {
-          throw new EmberError("cycle detected: " + toName + " <- " + path.join(" <- "));
-        }
-      }
-      visit(from, checkCycle);
-      from.hasOutgoing = true;
-      to.incoming[fromName] = from;
-      to.incomingNames.push(fromName);
-    };
-
-    /**
-     * Visits all the vertex of the graph calling the given function with each one,
-     * ensuring that the vertices are visited respecting their precedence.
-     *
-     * @method  topsort
-     * @param {Function} fn The function to be invoked on each vertex.
-     */
-    DAG.prototype.topsort = function(fn) {
-      var visited = {};
-      var vertices = this.vertices;
-      var names = this.names;
-      var len = names.length;
-      var i, vertex;
-
-      for (i = 0; i < len; i++) {
-        vertex = vertices[names[i]];
-        if (!vertex.hasOutgoing) {
-          visit(vertex, fn, visited);
-        }
-      }
-    };
-
-    /**
-     * Adds a vertex with the given name and value to the graph and joins it with the
-     * vertices referenced in _before_ and _after_. If there isn't vertices with those
-     * names, they are added too.
-     *
-     * If either _before_ or _after_ are falsy/empty, the added vertex will not have
-     * an incoming/outgoing edge.
-     *
-     * @method addEdges
-     * @param {String} name The name of the vertex to be added.
-     * @param         value The value of that vertex.
-     * @param        before An string or array of strings with the names of the vertices before
-     *                      which this vertex must be visited.
-     * @param         after An string or array of strings with the names of the vertex after
-     *                      which this vertex must be visited.
-     *
-     */
-    DAG.prototype.addEdges = function(name, value, before, after) {
-      var i;
-      this.map(name, value);
-      if (before) {
-        if (typeof before === 'string') {
-          this.addEdge(name, before);
-        } else {
-          for (i = 0; i < before.length; i++) {
-            this.addEdge(name, before[i]);
-          }
-        }
-      }
-      if (after) {
-        if (typeof after === 'string') {
-          this.addEdge(after, name);
-        } else {
-          for (i = 0; i < after.length; i++) {
-            this.addEdge(after[i], name);
-          }
-        }
-      }
-    };
-
-    __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__) {
@@ -3511,26 +3544,26 @@ enifed("ember-application/system/resolver",
       Some examples of how names are resolved:
 
       ```
-      'template:post' //=> Ember.TEMPLATES['post']
-      'template:posts/byline' //=> Ember.TEMPLATES['posts/byline']
-      'template:posts.byline' //=> Ember.TEMPLATES['posts/byline']
-      'template:blogPost' //=> Ember.TEMPLATES['blogPost']
-                          //   OR
-                          //   Ember.TEMPLATES['blog_post']
-      'controller:post' //=> App.PostController
-      'controller:posts.index' //=> App.PostsIndexController
-      'controller:blog/post' //=> Blog.PostController
-      'controller:basic' //=> Ember.Controller
-      'route:post' //=> App.PostRoute
-      'route:posts.index' //=> App.PostsIndexRoute
-      'route:blog/post' //=> Blog.PostRoute
-      'route:basic' //=> Ember.Route
-      'view:post' //=> App.PostView
-      'view:posts.index' //=> App.PostsIndexView
-      'view:blog/post' //=> Blog.PostView
-      'view:basic' //=> Ember.View
-      'foo:post' //=> App.PostFoo
-      'model:post' //=> App.Post
+      'template:post'           //=> Ember.TEMPLATES['post']
+      'template:posts/byline'   //=> Ember.TEMPLATES['posts/byline']
+      'template:posts.byline'   //=> Ember.TEMPLATES['posts/byline']
+      'template:blogPost'       //=> Ember.TEMPLATES['blogPost']
+                                //   OR
+                                //   Ember.TEMPLATES['blog_post']
+      'controller:post'         //=> App.PostController
+      'controller:posts.index'  //=> App.PostsIndexController
+      'controller:blog/post'    //=> Blog.PostController
+      'controller:basic'        //=> Ember.Controller
+      'route:post'              //=> App.PostRoute
+      'route:posts.index'       //=> App.PostsIndexRoute
+      'route:blog/post'         //=> Blog.PostRoute
+      'route:basic'             //=> Ember.Route
+      'view:post'               //=> App.PostView
+      'view:posts.index'        //=> App.PostsIndexView
+      'view:blog/post'          //=> Blog.PostView
+      'view:basic'              //=> Ember.View
+      'foo:post'                //=> App.PostFoo
+      'model:post'              //=> App.Post
       ```
 
       @class DefaultResolver
@@ -3556,7 +3589,9 @@ enifed("ember-application/system/resolver",
         var type = split[0];
         var 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);
+        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);
 
         if (type !== 'template') {
           var result = name;
@@ -3641,7 +3676,9 @@ enifed("ember-application/system/resolver",
           var namespaceName = capitalize(parts.slice(0, -1).join('.'));
           root = Namespace.byName(namespaceName);
 
-          Ember.assert('You are looking for a ' + name + ' ' + type + ' in the ' + namespaceName + ' namespace, but the namespace could not be found', root);
+          Ember.assert('You are looking for a ' + name + ' ' + type +
+                       ' in the ' + namespaceName +
+                       ' namespace, but the namespace could not be found', root);
         }
 
         return {
@@ -3821,8 +3858,8 @@ enifed("ember-application/system/resolver",
     });
   });
 enifed("ember-debug",
-  ["ember-metal/core","ember-metal/error","ember-metal/logger"],
-  function(__dependency1__, __dependency2__, __dependency3__) {
+  ["ember-metal/core","ember-metal/error","ember-metal/logger","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     /*global __fail__*/
 
@@ -3991,8 +4028,39 @@ enifed("ember-debug",
       func();
     };
 
-    // Inform the developer about the Ember Inspector if not installed.
-    if (!Ember.testing) {
+    /**
+      Will call `Ember.warn()` if ENABLE_ALL_FEATURES, ENABLE_OPTIONAL_FEATURES, or
+      any specific FEATURES flag is truthy.
+
+      This method is called automatically in debug canary builds.
+      
+      @private
+      @method _warnIfUsingStrippedFeatureFlags
+      @return {void}
+    */
+    function _warnIfUsingStrippedFeatureFlags(FEATURES, featuresWereStripped) {
+      if (featuresWereStripped) {
+        Ember.warn('Ember.ENV.ENABLE_ALL_FEATURES is only available in canary builds.', !Ember.ENV.ENABLE_ALL_FEATURES);
+        Ember.warn('Ember.ENV.ENABLE_OPTIONAL_FEATURES is only available in canary builds.', !Ember.ENV.ENABLE_OPTIONAL_FEATURES);
+
+        for (var key in FEATURES) {
+          if (FEATURES.hasOwnProperty(key) && key !== 'isEnabled') {
+            Ember.warn('FEATURE["' + key + '"] is set as enabled, but FEATURE flags are only available in canary builds.', !FEATURES[key]);
+          }
+        }
+      }
+    }
+
+    __exports__._warnIfUsingStrippedFeatureFlags = _warnIfUsingStrippedFeatureFlags;if (!Ember.testing) {
+      // Complain if they're using FEATURE flags in builds other than canary
+      Ember.FEATURES['features-stripped-test'] = true;
+      var featuresWereStripped = true;
+      
+      
+      delete Ember.FEATURES['features-stripped-test'];
+      _warnIfUsingStrippedFeatureFlags(Ember.ENV.FEATURES, featuresWereStripped);
+
+      // Inform the developer about the Ember Inspector if not installed.
       var isFirefox = typeof InstallTrigger !== 'undefined';
       var isChrome = !!window.chrome && !window.opera;
 
@@ -4125,7 +4193,7 @@ enifed("ember-extension-support/container_debug_adapter",
         @return {Array} An array of strings.
       */
       catalogEntriesByType: function(type) {
-        var namespaces = emberA(Namespace.NAMESPACES), types = emberA(), self = this;
+        var namespaces = emberA(Namespace.NAMESPACES), types = emberA();
         var typeSuffixRegex = new RegExp(classify(type) + "$");
 
         namespaces.forEach(function(namespace) {
@@ -4469,8 +4537,7 @@ enifed("ember-extension-support/data_adapter",
       */
       wrapModelType: function(type, name) {
         var records = this.getRecords(type);
-        var self = this;
-        var release, typeToSend;
+        var typeToSend;
 
         typeToSend = {
           name: name || type.toString(),
@@ -4571,8 +4638,6 @@ enifed("ember-extension-support/data_adapter",
       */
       wrapRecord: function(record) {
         var recordToSend = { object: record };
-        var columnValues = {};
-        var self = this;
 
         recordToSend.columnValues = this.getRecordColumnValues(record);
         recordToSend.searchKeywords = this.getRecordKeywords(record);
@@ -4688,14 +4753,13 @@ enifed("ember-handlebars-compiler",
       Handlebars = eriuqer('handlebars');
     }
 
-    Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1. Include " +
+    Ember.assert("Ember Handlebars requires Handlebars version 2.0. Include " +
                  "a SCRIPT tag in the HTML HEAD linking to the Handlebars file " +
                  "before you link to Ember.", Handlebars);
 
-    Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1, " +
-                 "COMPILER_REVISION expected: 4, got: " +  Handlebars.COMPILER_REVISION +
-                 " - Please note: Builds of master may have other COMPILER_REVISION values.",
-                 Handlebars.COMPILER_REVISION === 4);
+    Ember.assert("Ember Handlebars requires Handlebars version 2.0. " +
+                 "Please see more details at http://emberjs.com/blog/2014/10/16/handlebars-update.html.",
+                 Handlebars.COMPILER_REVISION === 6);
 
     /**
       Prepares the Handlebars templating library for use inside Ember's view
@@ -4711,7 +4775,7 @@ enifed("ember-handlebars-compiler",
       @class Handlebars
       @namespace Ember
     */
-    var EmberHandlebars = Ember.Handlebars = objectCreate(Handlebars);
+    var EmberHandlebars = Ember.Handlebars = Handlebars.create();
 
     /**
       Register a bound helper or custom view helper.
@@ -4770,7 +4834,8 @@ enifed("ember-handlebars-compiler",
       if (!View) { View = requireModule('ember-views/views/view')['default']; } // ES6TODO: stupid circular dep
       if (!Component) { Component = requireModule('ember-views/views/component')['default']; } // ES6TODO: stupid circular dep
 
-      Ember.assert("You tried to register a component named '" + name + "', but component names must include a '-'", !Component.detect(value) || name.match(/-/));
+      Ember.assert("You tried to register a component named '" + name +
+                   "', but component names must include a '-'", !Component.detect(value) || name.match(/-/));
 
       if (View.detect(value)) {
         EmberHandlebars.registerHelper(name, EmberHandlebars.makeViewHelper(value));
@@ -4793,7 +4858,8 @@ enifed("ember-handlebars-compiler",
     */
     EmberHandlebars.makeViewHelper = function(ViewClass) {
       return function(options) {
-        Ember.assert("You can only pass attributes (such as name=value) not bare values to a helper for a View found in '" + ViewClass.toString() + "'", arguments.length < 2);
+        Ember.assert("You can only pass attributes (such as name=value) not bare " +
+                     "values to a helper for a View found in '" + ViewClass.toString() + "'", arguments.length < 2);
         return EmberHandlebars.helpers.view.call(this, ViewClass, options);
       };
     };
@@ -4855,44 +4921,6 @@ enifed("ember-handlebars-compiler",
       return "data.buffer.push("+string+");";
     };
 
-    // Hacks ahead:
-    // Handlebars presently has a bug where the `blockHelperMissing` hook
-    // doesn't get passed the name of the missing helper name, but rather
-    // gets passed the value of that missing helper evaluated on the current
-    // context, which is most likely `undefined` and totally useless.
-    //
-    // So we alter the compiled template function to pass the name of the helper
-    // instead, as expected.
-    //
-    // 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]+)(,.*)/;
-
-    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);
-
-      source[source.length - 1] = matches[1] + "'" + helperName + "'" + matches[3];
-    };
-
-    var stringifyBlockHelperMissing = EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation;
-
-    var originalBlockValue = EmberHandlebars.JavaScriptCompiler.prototype.blockValue;
-    EmberHandlebars.JavaScriptCompiler.prototype.blockValue = function() {
-      originalBlockValue.apply(this, arguments);
-      stringifyBlockHelperMissing(this.source);
-    };
-
-    var originalAmbiguousBlockValue = EmberHandlebars.JavaScriptCompiler.prototype.ambiguousBlockValue;
-    EmberHandlebars.JavaScriptCompiler.prototype.ambiguousBlockValue = function() {
-      originalAmbiguousBlockValue.apply(this, arguments);
-      stringifyBlockHelperMissing(this.source);
-    };
-
     /**
       Rewrite simple mustaches from `{{foo}}` to `{{bind "foo"}}`. This means that
       all simple mustaches in Ember's Handlebars will also set up an observer to
@@ -4982,8 +5010,8 @@ enifed("ember-handlebars-compiler",
     __exports__["default"] = EmberHandlebars;
   });
 enifed("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__) {
+  ["ember-handlebars-compiler","ember-metal/core","ember-runtime/system/lazy_load","ember-handlebars/loader","ember-handlebars/ext","ember-handlebars/string","ember-handlebars/helpers/binding","ember-handlebars/helpers/if_unless","ember-handlebars/helpers/with","ember-handlebars/helpers/bind_attr","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__, __dependency27__, __dependency28__, __exports__) {
     "use strict";
     var EmberHandlebars = __dependency1__["default"];
     var Ember = __dependency2__["default"];
@@ -4992,68 +5020,61 @@ enifed("ember-handlebars",
     var runLoadHooks = __dependency3__.runLoadHooks;
     var bootstrap = __dependency4__["default"];
 
-    var normalizePath = __dependency5__.normalizePath;
-    var template = __dependency5__.template;
     var makeBoundHelper = __dependency5__.makeBoundHelper;
     var registerBoundHelper = __dependency5__.registerBoundHelper;
-    var resolveHash = __dependency5__.resolveHash;
-    var resolveParams = __dependency5__.resolveParams;
-    var getEscaped = __dependency5__.getEscaped;
-    var handlebarsGet = __dependency5__.handlebarsGet;
-    var evaluateUnboundHelper = __dependency5__.evaluateUnboundHelper;
     var helperMissingHelper = __dependency5__.helperMissingHelper;
     var blockHelperMissingHelper = __dependency5__.blockHelperMissingHelper;
+    var handlebarsGet = __dependency5__.handlebarsGet;
 
 
     // side effect of extending StringUtils of htmlSafe
 
-    var resolvePaths = __dependency7__["default"];
-    var bind = __dependency8__.bind;
-    var _triageMustacheHelper = __dependency8__._triageMustacheHelper;
-    var resolveHelper = __dependency8__.resolveHelper;
-    var bindHelper = __dependency8__.bindHelper;
+    var bind = __dependency7__.bind;
+    var _triageMustacheHelper = __dependency7__._triageMustacheHelper;
+    var resolveHelper = __dependency7__.resolveHelper;
+    var bindHelper = __dependency7__.bindHelper;
+
+    var ifHelper = __dependency8__.ifHelper;
     var boundIfHelper = __dependency8__.boundIfHelper;
     var unboundIfHelper = __dependency8__.unboundIfHelper;
-    var withHelper = __dependency8__.withHelper;
-    var ifHelper = __dependency8__.ifHelper;
     var unlessHelper = __dependency8__.unlessHelper;
-    var bindAttrHelper = __dependency8__.bindAttrHelper;
-    var bindAttrHelperDeprecated = __dependency8__.bindAttrHelperDeprecated;
-    var bindClasses = __dependency8__.bindClasses;
 
-    var collectionHelper = __dependency9__["default"];
-    var ViewHelper = __dependency10__.ViewHelper;
-    var viewHelper = __dependency10__.viewHelper;
-    var unboundHelper = __dependency11__["default"];
-    var logHelper = __dependency12__.logHelper;
-    var debuggerHelper = __dependency12__.debuggerHelper;
-    var EachView = __dependency13__.EachView;
-    var GroupedEach = __dependency13__.GroupedEach;
-    var eachHelper = __dependency13__.eachHelper;
-    var templateHelper = __dependency14__["default"];
-    var partialHelper = __dependency15__["default"];
-    var yieldHelper = __dependency16__["default"];
-    var locHelper = __dependency17__["default"];
+    var withHelper = __dependency9__["default"];
+
+    var bindAttrHelper = __dependency10__.bindAttrHelper;
+    var bindAttrHelperDeprecated = __dependency10__.bindAttrHelperDeprecated;
+    var bindClasses = __dependency10__.bindClasses;
+
+    var collectionHelper = __dependency11__["default"];
+    var ViewHelper = __dependency12__.ViewHelper;
+    var viewHelper = __dependency12__.viewHelper;
+    var unboundHelper = __dependency13__["default"];
+    var logHelper = __dependency14__.logHelper;
+    var debuggerHelper = __dependency14__.debuggerHelper;
+    var EachView = __dependency15__.EachView;
+    var eachHelper = __dependency15__.eachHelper;
+    var templateHelper = __dependency16__["default"];
+    var partialHelper = __dependency17__["default"];
+    var yieldHelper = __dependency18__["default"];
+    var locHelper = __dependency19__["default"];
 
 
-    var Checkbox = __dependency18__["default"];
-    var Select = __dependency19__.Select;
-    var SelectOption = __dependency19__.SelectOption;
-    var SelectOptgroup = __dependency19__.SelectOptgroup;
-    var TextArea = __dependency20__["default"];
-    var TextField = __dependency21__["default"];
-    var TextSupport = __dependency22__["default"];
-    var inputHelper = __dependency23__.inputHelper;
-    var textareaHelper = __dependency23__.textareaHelper;
+    var Checkbox = __dependency20__["default"];
+    var Select = __dependency21__.Select;
+    var SelectOption = __dependency21__.SelectOption;
+    var SelectOptgroup = __dependency21__.SelectOptgroup;
+    var TextArea = __dependency22__["default"];
+    var TextField = __dependency23__["default"];
+    var TextSupport = __dependency24__["default"];
+    var inputHelper = __dependency25__.inputHelper;
+    var textareaHelper = __dependency25__.textareaHelper;
 
-
-    var ComponentLookup = __dependency24__["default"];
-    var _HandlebarsBoundView = __dependency25__._HandlebarsBoundView;
-    var SimpleHandlebarsView = __dependency25__.SimpleHandlebarsView;
-    var _wrapMap = __dependency26__._wrapMap;
-    var _SimpleMetamorphView = __dependency26__._SimpleMetamorphView;
-    var _MetamorphView = __dependency26__._MetamorphView;
-    var _Metamorph = __dependency26__._Metamorph;
+    var ComponentLookup = __dependency26__["default"];
+    var _HandlebarsBoundView = __dependency27__._HandlebarsBoundView;
+    var SimpleHandlebarsView = __dependency27__.SimpleHandlebarsView;
+    var _MetamorphView = __dependency28__["default"];
+    var _SimpleMetamorphView = __dependency28__._SimpleMetamorphView;
+    var _Metamorph = __dependency28__._Metamorph;
 
 
     /**
@@ -5066,33 +5087,24 @@ enifed("ember-handlebars",
 
     // Ember.Handlebars.Globals
     EmberHandlebars.bootstrap = bootstrap;
-    EmberHandlebars.template = template;
     EmberHandlebars.makeBoundHelper = makeBoundHelper;
     EmberHandlebars.registerBoundHelper = registerBoundHelper;
-    EmberHandlebars.resolveHash = resolveHash;
-    EmberHandlebars.resolveParams = resolveParams;
     EmberHandlebars.resolveHelper = resolveHelper;
-    EmberHandlebars.get = handlebarsGet;
-    EmberHandlebars.getEscaped = getEscaped;
-    EmberHandlebars.evaluateUnboundHelper = evaluateUnboundHelper;
     EmberHandlebars.bind = bind;
     EmberHandlebars.bindClasses = bindClasses;
     EmberHandlebars.EachView = EachView;
-    EmberHandlebars.GroupedEach = GroupedEach;
-    EmberHandlebars.resolvePaths = resolvePaths;
     EmberHandlebars.ViewHelper = ViewHelper;
-    EmberHandlebars.normalizePath = normalizePath;
 
 
     // Ember Globals
     Ember.Handlebars = EmberHandlebars;
+    EmberHandlebars.get = handlebarsGet;
     Ember.ComponentLookup = ComponentLookup;
     Ember._SimpleHandlebarsView = SimpleHandlebarsView;
     Ember._HandlebarsBoundView = _HandlebarsBoundView;
     Ember._SimpleMetamorphView = _SimpleMetamorphView;
     Ember._MetamorphView = _MetamorphView;
     Ember._Metamorph = _Metamorph;
-    Ember._metamorphWrapMap = _wrapMap;
     Ember.TextSupport = TextSupport;
     Ember.Checkbox = Checkbox;
     Ember.Select = Select;
@@ -5138,7 +5150,7 @@ enifed("ember-handlebars/component_lookup",
     "use strict";
     var EmberObject = __dependency1__["default"];
 
-    var ComponentLookup = EmberObject.extend({
+    __exports__["default"] = EmberObject.extend({
       lookupFactory: function(name, container) {
 
         container = container || this.container;
@@ -5164,12 +5176,10 @@ enifed("ember-handlebars/component_lookup",
         }
       }
     });
-
-    __exports__["default"] = ComponentLookup;
   });
 enifed("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__) {
+  ["ember-handlebars/controls/checkbox","ember-handlebars/controls/text_field","ember-handlebars/controls/text_area","ember-metal/core","ember-handlebars-compiler","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var Checkbox = __dependency1__["default"];
     var TextField = __dependency2__["default"];
@@ -5180,21 +5190,12 @@ enifed("ember-handlebars/controls",
     // var emberAssert = Ember.assert;
 
     var EmberHandlebars = __dependency5__["default"];
-    var handlebarsGet = __dependency6__.handlebarsGet;
-    var helpers = EmberHandlebars.helpers;
+
     /**
     @module ember
     @submodule ember-handlebars-compiler
     */
 
-    function _resolveOption(context, options, key) {
-      if (options.hashTypes[key] === "ID") {
-        return handlebarsGet(context, options.hash[key], options);
-      } else {
-        return options.hash[key];
-      }
-    }
-
     /**
 
       The `{{input}}` helper inserts an HTML `<input>` tag into the template,
@@ -5261,10 +5262,12 @@ enifed("ember-handlebars/controls",
       The action property defines the action which is sent when
       the user presses the return key.
 
+
       ```handlebars
       {{input action="submit"}}
       ```
 
+
       The helper allows some user events to send actions.
 
     * `enter`
@@ -5278,10 +5281,12 @@ enifed("ember-handlebars/controls",
       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.
 
+
       ```handlebars
       {{input focus-in="alertMessage"}}
       ```
 
+
       See more about [Text Support Actions](/api/classes/Ember.TextField.html)
 
       ## Extension
@@ -5374,23 +5379,31 @@ enifed("ember-handlebars/controls",
     function inputHelper(options) {
       Ember.assert('You can only pass attributes to the `input` helper, not arguments', arguments.length < 2);
 
+      var view = options.data.view;
       var hash = options.hash;
       var types = options.hashTypes;
-      var inputType = _resolveOption(this, options, 'type');
       var onEvent = hash.on;
+      var inputType;
+
+      if (types.type === 'ID') {
+        inputType = view.getStream(hash.type).value();
+      } else {
+        inputType = hash.type;
+      }
 
       if (inputType === 'checkbox') {
         delete hash.type;
         delete types.type;
 
-        Ember.assert("{{input type='checkbox'}} does not support setting `value=someBooleanValue`; you must use `checked=someBooleanValue` instead.", options.hashTypes.value !== 'ID');
+        Ember.assert("{{input type='checkbox'}} does not support setting `value=someBooleanValue`;" +
+                     " you must use `checked=someBooleanValue` instead.", options.hashTypes.value !== 'ID');
 
-        return helpers.view.call(this, Checkbox, options);
+        return EmberHandlebars.helpers.view.call(this, Checkbox, options);
       } else {
         delete hash.on;
 
         hash.onEvent = onEvent || 'enter';
-        return helpers.view.call(this, TextField, options);
+        return EmberHandlebars.helpers.view.call(this, TextField, options);
       }
     }
 
@@ -5582,10 +5595,7 @@ 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;
-
-      return helpers.view.call(this, TextArea, options);
+      return EmberHandlebars.helpers.view.call(this, TextArea, options);
     }
 
     __exports__.textareaHelper = textareaHelper;
@@ -5693,7 +5703,6 @@ enifed("ember-handlebars/controls/select",
     var observer = __dependency11__.observer;
     var defineProperty = __dependency12__.defineProperty;
 
-    var precompileTemplate = EmberHandlebars.compile;
 
     var SelectOption = View.extend({
       instrumentDisplay: 'Ember.SelectOption',
@@ -6005,59 +6014,42 @@ enifed("ember-handlebars/controls/select",
 
       tagName: 'select',
       classNames: ['ember-select'],
-      defaultTemplate: Ember.Handlebars.template(function anonymous(Handlebars,depth0,helpers,partials,data) {
-    this.compilerInfo = [4,'>= 1.0.0'];
-    helpers = this.merge(helpers, Ember.Handlebars.helpers); data = data || {};
-      var buffer = '', stack1, escapeExpression=this.escapeExpression, self=this;
-
-    function program1(depth0,data) {
-      
-      var buffer = '', stack1;
+      defaultTemplate: Ember.Handlebars.template({"1":function(depth0,helpers,partials,data) {
+      var stack1, buffer = '';
       data.buffer.push("<option value=\"\">");
-      stack1 = helpers._triageMustache.call(depth0, "view.prompt", {hash:{},hashTypes:{},hashContexts:{},contexts:[depth0],types:["ID"],data:data});
-      if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+      stack1 = helpers._triageMustache.call(depth0, "view.prompt", {"name":"_triageMustache","hash":{},"hashTypes":{},"hashContexts":{},"types":["ID"],"contexts":[depth0],"data":data});
+      if (stack1 != null) { data.buffer.push(stack1); }
       data.buffer.push("</option>");
       return buffer;
-      }
-
-    function program3(depth0,data) {
-      
+    },"3":function(depth0,helpers,partials,data) {
       var stack1;
-      stack1 = helpers.each.call(depth0, "view.groupedContent", {hash:{},hashTypes:{},hashContexts:{},inverse:self.noop,fn:self.program(4, program4, data),contexts:[depth0],types:["ID"],data:data});
-      if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+      stack1 = helpers.each.call(depth0, "group", "in", "view.groupedContent", {"name":"each","hash":{},"hashTypes":{},"hashContexts":{},"fn":this.program(4, data),"inverse":this.noop,"types":["ID","ID","ID"],"contexts":[depth0,depth0,depth0],"data":data});
+      if (stack1 != null) { data.buffer.push(stack1); }
       else { data.buffer.push(''); }
-      }
-    function program4(depth0,data) {
-      
-      
-      data.buffer.push(escapeExpression(helpers.view.call(depth0, "view.groupView", {hash:{
-        'content': ("content"),
-        'label': ("label")
-      },hashTypes:{'content': "ID",'label': "ID"},hashContexts:{'content': depth0,'label': depth0},contexts:[depth0],types:["ID"],data:data})));
-      }
-
-    function program6(depth0,data) {
-      
+      },"4":function(depth0,helpers,partials,data) {
+      var escapeExpression=this.escapeExpression;
+      data.buffer.push(escapeExpression(helpers.view.call(depth0, "view.groupView", {"name":"view","hash":{
+        'label': ("group.label"),
+        'content': ("group.content")
+      },"hashTypes":{'label': "ID",'content': "ID"},"hashContexts":{'label': depth0,'content': depth0},"types":["ID"],"contexts":[depth0],"data":data})));
+      },"6":function(depth0,helpers,partials,data) {
       var stack1;
-      stack1 = helpers.each.call(depth0, "view.content", {hash:{},hashTypes:{},hashContexts:{},inverse:self.noop,fn:self.program(7, program7, data),contexts:[depth0],types:["ID"],data:data});
-      if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+      stack1 = helpers.each.call(depth0, "item", "in", "view.content", {"name":"each","hash":{},"hashTypes":{},"hashContexts":{},"fn":this.program(7, data),"inverse":this.noop,"types":["ID","ID","ID"],"contexts":[depth0,depth0,depth0],"data":data});
+      if (stack1 != null) { data.buffer.push(stack1); }
       else { data.buffer.push(''); }
-      }
-    function program7(depth0,data) {
-      
-      
-      data.buffer.push(escapeExpression(helpers.view.call(depth0, "view.optionView", {hash:{
-        'content': ("")
-      },hashTypes:{'content': "ID"},hashContexts:{'content': depth0},contexts:[depth0],types:["ID"],data:data})));
-      }
-
-      stack1 = helpers['if'].call(depth0, "view.prompt", {hash:{},hashTypes:{},hashContexts:{},inverse:self.noop,fn:self.program(1, program1, data),contexts:[depth0],types:["ID"],data:data});
-      if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
-      stack1 = helpers['if'].call(depth0, "view.optionGroupPath", {hash:{},hashTypes:{},hashContexts:{},inverse:self.program(6, program6, data),fn:self.program(3, program3, data),contexts:[depth0],types:["ID"],data:data});
-      if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+      },"7":function(depth0,helpers,partials,data) {
+      var escapeExpression=this.escapeExpression;
+      data.buffer.push(escapeExpression(helpers.view.call(depth0, "view.optionView", {"name":"view","hash":{
+        'content': ("item")
+      },"hashTypes":{'content': "ID"},"hashContexts":{'content': depth0},"types":["ID"],"contexts":[depth0],"data":data})));
+      },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+      var stack1, buffer = '';
+      stack1 = helpers['if'].call(depth0, "view.prompt", {"name":"if","hash":{},"hashTypes":{},"hashContexts":{},"fn":this.program(1, data),"inverse":this.noop,"types":["ID"],"contexts":[depth0],"data":data});
+      if (stack1 != null) { data.buffer.push(stack1); }
+      stack1 = helpers['if'].call(depth0, "view.optionGroupPath", {"name":"if","hash":{},"hashTypes":{},"hashContexts":{},"fn":this.program(3, data),"inverse":this.program(6, data),"types":["ID"],"contexts":[depth0],"data":data});
+      if (stack1 != null) { data.buffer.push(stack1); }
       return buffer;
-      
-    }),
+    },"useData":true}),
       attributeBindings: ['multiple', 'disabled', 'tabindex', 'name', 'required', 'autofocus',
                           'form', 'size'],
 
@@ -6385,7 +6377,16 @@ 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',
+        'lang',
+        'dir'
+      ],
       rows: null,
       cols: null,
 
@@ -6405,18 +6406,15 @@ enifed("ember-handlebars/controls/text_area",
     });
   });
 enifed("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__) {
+  ["ember-views/views/component","ember-handlebars/controls/text_support","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     /**
     @module ember
     @submodule ember-handlebars
     */
-
-    var get = __dependency1__.get;
-    var set = __dependency2__.set;
-    var Component = __dependency3__["default"];
-    var TextSupport = __dependency4__["default"];
+    var Component = __dependency1__["default"];
+    var TextSupport = __dependency2__["default"];
 
     /**
 
@@ -6441,11 +6439,31 @@ enifed("ember-handlebars/controls/text_field",
 
       classNames: ['ember-text-field'],
       tagName: "input",
-      attributeBindings: ['type', 'value', 'size', 'pattern', 'name', 'min', 'max',
-                          'accept', 'autocomplete', 'autosave', 'formaction',
-                          'formenctype', 'formmethod', 'formnovalidate', 'formtarget',
-                          'height', 'inputmode', 'list', 'multiple', 'step', 'lang', 'dir',
-                          'width'],
+      attributeBindings: [
+        'accept',
+        'autocomplete',
+        'autosave',
+        'dir',
+        'formaction',
+        'formenctype',
+        'formmethod',
+        'formnovalidate',
+        'formtarget',
+        'height',
+        'inputmode',
+        'lang',
+        'list',
+        'max',
+        'min',
+        'multiple',
+        'name',
+        'pattern',
+        'size',
+        'step',
+        'type',
+        'value',
+        'width'
+      ],
 
       /**
         The `value` attribute of the input element. As the user inputs text, this
@@ -6531,21 +6549,30 @@ enifed("ember-handlebars/controls/text_support",
     var TextSupport = Mixin.create(TargetActionSupport, {
       value: "",
 
-      attributeBindings: ['placeholder', 'disabled', 'maxlength', 'tabindex', 'readonly',
-                          'autofocus', 'form', 'selectionDirection', 'spellcheck', 'required',
-                          'title', 'autocapitalize', 'autocorrect'],
+      attributeBindings: [
+        'autocapitalize',
+        'autocorrect',
+        'autofocus',
+        'disabled',
+        'form',
+        'maxlength',
+        'placeholder',
+        'readonly',
+        'required',
+        'selectionDirection',
+        'spellcheck',
+        'tabindex',
+        'title'
+      ],
       placeholder: null,
       disabled: false,
       maxlength: null,
 
       init: function() {
         this._super();
-        this.on("focusOut", this, this._elementValueDidChange);
-        this.on("change", this, this._elementValueDidChange);
         this.on("paste", this, this._elementValueDidChange);
         this.on("cut", this, this._elementValueDidChange);
         this.on("input", this, this._elementValueDidChange);
-        this.on("keyUp", this, this.interpretKeyEvents);
       },
 
       /**
@@ -6631,6 +6658,10 @@ enifed("ember-handlebars/controls/text_support",
         sendAction('escape-press', this, event);
       },
 
+      change: function(event) {
+        this._elementValueDidChange(event);
+      },
+
       /**
         Called when the text area is focused.
 
@@ -6652,6 +6683,7 @@ enifed("ember-handlebars/controls/text_support",
         @param {Event} event
       */
       focusOut: function(event) {
+        this._elementValueDidChange(event);
         sendAction('focus-out', this, event);
       },
 
@@ -6666,8 +6698,36 @@ enifed("ember-handlebars/controls/text_support",
       */
       keyPress: function(event) {
         sendAction('key-press', this, event);
-      }
+      },
 
+      /**
+        Called when the browser triggers a `keyup` event on the element.
+
+        Uses sendAction to send the `key-up` action passing the current value
+        and event as parameters.
+
+        @method keyUp
+        @param {Event} event
+      */
+      keyUp: function(event) {
+        this.interpretKeyEvents(event);
+
+        this.sendAction('key-up', get(this, 'value'), event);
+      },
+
+      /**
+        Called when the browser triggers a `keydown` event on the element.
+
+        Uses sendAction to send the `key-down` action passing the current value
+        and event as parameters. Note that generally in key-down the value is unchanged
+        (as the key pressing has not completed yet).
+
+        @method keyDown
+        @param {Event} event
+      */
+      keyDown: function(event) {
+        this.sendAction('key-down', get(this, 'value'), event);
+      }
     });
 
     TextSupport.KEY_EVENTS = {
@@ -6702,8 +6762,8 @@ 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__) {
+  ["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-metal/path_cache","ember-metal/streams/stream","ember-metal/streams/read","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.FEATURES, Ember.assert, Ember.Handlebars, Ember.lookup
@@ -6712,76 +6772,22 @@ enifed("ember-handlebars/ext",
     var fmt = __dependency2__.fmt;
 
     var EmberHandlebars = __dependency3__["default"];
-    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 detectIsGlobal = __dependency8__.isGlobal;
 
     // late bound via requireModule because of circular dependencies.
     var resolveHelper, SimpleHandlebarsView;
 
-    var isEmpty = __dependency10__["default"];
+    var Stream = __dependency9__["default"];
+    var readArray = __dependency10__.readArray;
+    var readHash = __dependency10__.readHash;
 
     var slice = [].slice;
-    var originalTemplate = EmberHandlebars.template;
-
-    /**
-      If a path starts with a reserved keyword, returns the root
-      that should be used.
-
-      @private
-      @method normalizePath
-      @for Ember
-      @param root {Object}
-      @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;
-
-      // Get the first segment of the path. For example, if the
-      // path is "foo.bar.baz", returns "foo".
-      keyword = FIRST_SEGMENT_CACHE.get(path);
-
-      // 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
-      // that object as the new root.
-      if (keywords.hasOwnProperty(keyword)) {
-        // Look up the value in the template's data hash.
-        root = keywords[keyword];
-        isKeyword = true;
-
-        // Handle cases where the entire path is the reserved
-        // word. In that case, return the object itself.
-        if (path === keyword) {
-          path = '';
-        } else {
-          // Strip the keyword from the path and look up
-          // the remainder from the newly found root.
-          path = path.substr(keyword.length+1);
-        }
-      }
-
-      return {
-        root: root,
-        path: path,
-        isKeyword: isKeyword
-      };
-    }
-
 
     /**
       Lookup both on root and on window. If the path starts with
@@ -6793,53 +6799,12 @@ enifed("ember-handlebars/ext",
       @param {Object} root The object to look up the property on
       @param {String} path The path to be lookedup
       @param {Object} options The template's option hash
+      @deprecated
     */
     function handlebarsGet(root, path, options) {
-      var data = options && options.data;
-      var normalizedPath = normalizePath(root, path, data);
-      var value;
+      Ember.deprecate('Usage of Ember.Handlebars.get is deprecated, use a Component or Ember.Handlebars.makeBoundHelper instead.');
 
-      // 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) {
-          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;
-      }
+      return options.data.view.getStream(path).value();
     }
 
     /**
@@ -6866,42 +6831,32 @@ enifed("ember-handlebars/ext",
       @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
+      @param {Object} data The template's data hash
     */
-    function handlebarsGetView(context, path, container, options) {
+    function handlebarsGetView(context, path, container, data) {
       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 (!data) {
+          throw new Error("handlebarsGetView: must pass data");
         }
 
-        if(!viewClass) {
-          viewClass = lookupViewByClassName(path);
+        // Only lookup view class on context if there is a context. If not,
+        // the global lookup path on get may kick in.
+        var lazyValue = data.view.getStream(path);
+        viewClass = lazyValue.value();
+        var isGlobal = detectIsGlobal(path);
+
+        if (!viewClass && !isGlobal) {
+          Ember.assert("View requires a container to resolve views not passed in through the context", !!container);
+          viewClass = container.lookupFactory('view:'+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);
+        if (!viewClass && isGlobal) {
+          var globalViewClass = 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', !globalViewClass);
+          if (globalViewClass) {
+            viewClass = globalViewClass;
           }
         }
       } else {
@@ -6910,84 +6865,32 @@ enifed("ember-handlebars/ext",
 
       // 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']
-        });
+        viewClass = handlebarsGetView(data.view, viewClass, container, data);
       }
 
       Ember.assert(
-        fmt(path+" must be a subclass or an instance of Ember.View, not %@", [viewClass]),
-        View.detect(viewClass) || View.detectInstance(viewClass)
+        fmt(path+" must be a subclass of Ember.View, not %@", [viewClass]),
+        View.detect(viewClass)
       );
 
       return viewClass;
     }
 
-    /**
-      This method uses `Ember.Handlebars.get` to lookup a value, then ensures
-      that the value is escaped properly.
-
-      If `unescaped` is a truthy value then the escaping will not be performed.
-
-      @method getEscaped
-      @for Ember.Handlebars
-      @param {Object} root The object to look up the property on
-      @param {String} path The path to be lookedup
-      @param {Object} options The template's option hash
-      @since 1.4.0
-    */
-    function getEscaped(root, path, options) {
-      var result = handlebarsGet(root, path, options);
-
-      if (result === null || result === undefined) {
-        result = "";
-      } else if (!(result instanceof Handlebars.SafeString)) {
-        result = String(result);
-      }
-      if (!options.hash.unescaped){
-        result = Handlebars.Utils.escapeExpression(result);
+    function stringifyValue(value, shouldEscape) {
+      if (value === null || value === undefined) {
+        value = "";
+      } else if (!(value instanceof Handlebars.SafeString)) {
+        value = String(value);
       }
 
-      return result;
+      if (shouldEscape) {
+        value = Handlebars.Utils.escapeExpression(value);
+      }
+
+      return value;
     }
 
-    __exports__.getEscaped = getEscaped;function resolveParams(context, params, options) {
-      var resolvedParams = [], types = options.types, param, type;
-
-      for (var i=0, l=params.length; i<l; i++) {
-        param = params[i];
-        type = types[i];
-
-        if (type === 'ID') {
-          resolvedParams.push(handlebarsGet(context, param, options));
-        } else {
-          resolvedParams.push(param);
-        }
-      }
-
-      return resolvedParams;
-    }
-
-    __exports__.resolveParams = resolveParams;function resolveHash(context, hash, options) {
-      var resolvedHash = {}, types = options.hashTypes, type;
-
-      for (var key in hash) {
-        if (!hash.hasOwnProperty(key)) { continue; }
-
-        type = types[key];
-
-        if (type === 'ID') {
-          resolvedHash[key] = handlebarsGet(context, hash[key], options);
-        } else {
-          resolvedHash[key] = hash[key];
-        }
-      }
-
-      return resolvedHash;
-    }
-
-    __exports__.resolveHash = resolveHash;/**
+    __exports__.stringifyValue = stringifyValue;/**
       Registers a helper in Handlebars that will be called if no property with the
       given name can be found on the current context object, and no helper with
       that name is registered.
@@ -7002,57 +6905,42 @@ enifed("ember-handlebars/ext",
       @param {Hash} options
     */
     function helperMissingHelper(path) {
-      if (!resolveHelper) { resolveHelper = requireModule('ember-handlebars/helpers/binding')['resolveHelper']; } // ES6TODO: stupid circular dep
+      if (!resolveHelper) {
+        resolveHelper = requireModule('ember-handlebars/helpers/binding')['resolveHelper'];
+      } // ES6TODO: stupid circular dep
 
-      var error, view = "";
+      var error, fmtError, view = "";
 
       var options = arguments[arguments.length - 1];
 
-      var helper = resolveHelper(options.data.view.container, path);
+      var helper = resolveHelper(options.data.view.container, options.name);
 
       if (helper) {
-        return helper.apply(this, slice.call(arguments, 1));
+        return helper.apply(this, arguments);
       }
 
-      error = "%@ Handlebars error: Could not find property '%@' on object %@.";
       if (options.data) {
         view = options.data.view;
       }
-      throw new EmberError(fmt(error, [view, path, this]));
+
+      if (options.name.match(/-/)) {
+        error = "%@ Handlebars error: Could not find component or helper named '%@'";
+        fmtError = fmt(error, [view, options.name]);
+      } else {
+        error = "%@ Handlebars error: Could not find property '%@' on object %@.";
+        fmtError = fmt(error, [view, options.name, this]);
+      }
+
+      throw new EmberError(fmtError);
     }
 
     __exports__.helperMissingHelper = helperMissingHelper;/**
-      Registers a helper in Handlebars that will be called if no property with the
-      given name can be found on the current context object, and no helper with
-      that name is registered.
-
-      This throws an exception with a more helpful error message so the user can
-      track down where the problem is happening.
-
       @private
-      @method helperMissing
+      @method blockHelperMissingHelper
       @for Ember.Handlebars.helpers
-      @param {String} path
-      @param {Hash} options
     */
-    function blockHelperMissingHelper(path) {
-      if (!resolveHelper) { resolveHelper = requireModule('ember-handlebars/helpers/binding')['resolveHelper']; } // ES6TODO: stupid circular dep
-
-      var options = arguments[arguments.length - 1];
-
-      Ember.assert("`blockHelperMissing` was invoked without a helper name, which " +
-                   "is most likely due to a mismatch between the version of " +
-                   "Ember.js you're running now and the one used to precompile your " +
-                   "templates. Please make sure the version of " +
-                   "`ember-handlebars-compiler` you're using is up to date.", path);
-
-      var helper = resolveHelper(options.data.view.container, path);
-
-      if (helper) {
-        return helper.apply(this, slice.call(arguments, 1));
-      } else {
-        return helpers.helperMissing.call(this, path);
-      }
+    function blockHelperMissingHelper() {
+      return;
     }
 
     __exports__.blockHelperMissingHelper = blockHelperMissingHelper;/**
@@ -7196,191 +7084,112 @@ enifed("ember-handlebars/ext",
       @since 1.2.0
     */
     function makeBoundHelper(fn) {
-      if (!SimpleHandlebarsView) { SimpleHandlebarsView = requireModule('ember-handlebars/views/handlebars_bound_view')['SimpleHandlebarsView']; } // ES6TODO: stupid circular dep
+      if (!SimpleHandlebarsView) {
+        SimpleHandlebarsView = requireModule('ember-handlebars/views/handlebars_bound_view')['SimpleHandlebarsView'];
+      } // ES6TODO: stupid circular dep
 
-      var dependentKeys = slice.call(arguments, 1);
+      var dependentKeys = [];
+      for (var i = 1; i < arguments.length; i++) {
+        dependentKeys.push(arguments[i]);
+      }
 
       function helper() {
-        var properties = slice.call(arguments, 0, -1);
-        var numProperties = properties.length;
-        var options = arguments[arguments.length - 1];
-        var normalizedProperties = [];
+        var numParams = arguments.length - 1;
+        var options = arguments[numParams];
         var data = options.data;
-        var types = data.isUnbound ? slice.call(options.types, 1) : options.types;
+        var view = data.view;
+        var types = options.types;
         var hash = options.hash;
         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;
+        var context = this;
 
         Ember.assert("registerBoundHelper-generated helpers do not support use with Handlebars blocks.", !options.fn);
 
-        // Detect bound options (e.g. countBinding="otherCount")
-        var boundOptions = hash.boundOptions = {};
-        for (hashOption in hash) {
-          if (IS_BINDING.test(hashOption)) {
-            // Lop off 'Binding' suffix.
-            boundOptions[hashOption.slice(0, -7)] = hash[hashOption];
-          } else if (hashTypes[hashOption] === 'ID') {
-            boundOptions[hashOption] = hash[hashOption];
-          }
-        }
+        var properties = new Array(numParams);
+        var params = new Array(numParams);
 
-        // Expose property names on data.properties object.
-        var watchedProperties = [];
-        data.properties = [];
-        for (loc = 0; loc < numProperties; ++loc) {
-          data.properties.push(properties[loc]);
-          if (types[loc] === 'ID') {
-            var normalizedProp = normalizePath(currentContext, properties[loc], data);
-            normalizedProperties.push(normalizedProp);
-            watchedProperties.push(normalizedProp);
+        for (var i = 0; i < numParams; i++) {
+          properties[i] = arguments[i];
+          if (types[i] === 'ID') {
+            params[i] = view.getStream(arguments[i]);
           } else {
-            if (data.isUnbound) {
-              normalizedProperties.push({path: properties[loc]});
-            }else {
-              normalizedProperties.push(null);
-            }
+            params[i] = arguments[i];
           }
         }
 
-        // Handle case when helper invocation is preceded by `unbound`, e.g.
-        // {{unbound myHelper foo}}
-        if (data.isUnbound) {
-          return evaluateUnboundHelper(this, fn, normalizedProperties, options);
+        for (var prop in hash) {
+          if (IS_BINDING.test(prop)) {
+            hash[prop.slice(0, -7)] = view.getStream(hash[prop]);
+            hash[prop] = undefined;
+          } else if (hashTypes[prop] === 'ID') {
+            hash[prop] = view.getStream(hash[prop]);
+          }
         }
 
-        var bindView = new SimpleHandlebarsView(null, null, !options.hash.unescaped, options.data);
-
-        // Override SimpleHandlebarsView's method for generating the view's content.
-        bindView.normalizedValue = function() {
-          var args = [];
-          var boundOption;
-
-          // Copy over bound hash options.
-          for (boundOption in boundOptions) {
-            if (!boundOptions.hasOwnProperty(boundOption)) { continue; }
-            property = normalizePath(currentContext, boundOptions[boundOption], data);
-            bindView.path = property.path;
-            bindView.pathRoot = property.root;
-            hash[boundOption] = normalizedValue.call(bindView);
-          }
-
-          for (loc = 0; loc < numProperties; ++loc) {
-            property = normalizedProperties[loc];
-            if (property) {
-              bindView.path = property.path;
-              bindView.pathRoot = property.root;
-              args.push(normalizedValue.call(bindView));
-            } else {
-              args.push(properties[loc]);
-            }
-          }
-          args.push(options);
-
-          // Run the supplied helper function.
-          return fn.apply(currentContext, args);
+        var valueFn = function() {
+          var args = readArray(params);
+          args.push({
+            hash: readHash(hash),
+            data: { properties: properties }
+          });
+          return fn.apply(context, args);
         };
 
-        view.appendChild(bindView);
+        if (data.isUnbound) {
+          return valueFn();
+        } else {
+          var lazyValue = new Stream(valueFn);
+          var bindView = new SimpleHandlebarsView(lazyValue, !options.hash.unescaped);
+          view.appendChild(bindView);
 
-        // Assemble list of watched properties that'll re-render this helper.
-        for (boundOption in boundOptions) {
-          if (boundOptions.hasOwnProperty(boundOption)) {
-            watchedProperties.push(normalizePath(currentContext, boundOptions[boundOption], data));
+          var scheduledRerender = view._wrapAsScheduled(bindView.rerender);
+          lazyValue.subscribe(scheduledRerender, bindView);
+
+          var param;
+
+          for (i = 0; i < numParams; i++) {
+            param = params[i];
+            if (param && param.isStream) {
+              param.subscribe(lazyValue.notify, lazyValue);
+            }
           }
-        }
 
-        // Observe each property.
-        for (loc = 0, len = watchedProperties.length; loc < len; ++loc) {
-          property = watchedProperties[loc];
-          view.registerObserver(property.root, property.path, bindView, bindView.rerender);
-        }
+          for (prop in hash) {
+            param = hash[prop];
+            if (param && param.isStream) {
+              param.subscribe(lazyValue.notify, lazyValue);
+            }
+          }
 
-        if (types[0] !== 'ID' || normalizedProperties.length === 0) {
-          return;
-        }
-
-        // Add dependent key observers to the first param
-        var normalized = normalizedProperties[0];
-        var pathRoot = normalized.root;
-        var path = normalized.path;
-
-        if(!isEmpty(path)) {
-          prefixPathForDependentKeys = path + '.';
-        }
-        for (var i=0, l=dependentKeys.length; i<l; i++) {
-          view.registerObserver(pathRoot, prefixPathForDependentKeys + dependentKeys[i], bindView, bindView.rerender);
+          if (numParams > 0) {
+            var firstParam = params[0];
+            // Only bother with subscriptions if the first argument
+            // is a stream itself, and not a primitive.
+            if (firstParam && firstParam.isStream) {
+              var onDependentKeyNotify = function onDependentKeyNotify(stream) {
+                stream.value();
+                lazyValue.notify();
+              };
+              for (i = 0; i < dependentKeys.length; i++) {
+                var childParam = firstParam.get(dependentKeys[i]);
+                childParam.value();
+                childParam.subscribe(onDependentKeyNotify);
+              }
+            }
+          }
         }
       }
 
-      helper._rawFunction = fn;
       return helper;
     }
 
-    /**
-      Renders the unbound form of an otherwise bound helper function.
-
-      @private
-      @method evaluateUnboundHelper
-      @param {Function} fn
-      @param {Object} context
-      @param {Array} normalizedProperties
-      @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;
-
-      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) {
-        property = normalizedProperties[loc];
-        propertyType = types[loc];
-        if (propertyType === "ID") {
-          args.push(handlebarsGet(property.root, property.path, options));
-        } else {
-          args.push(property.path);
-        }
-      }
-      args.push(options);
-      return fn.apply(context, args);
-    }
-
-    /**
-      Overrides Handlebars.template so that we can distinguish
-      user-created, top-level templates from inner contexts.
-
-      @private
-      @method template
-      @for Ember.Handlebars
-      @param {String} spec
-    */
-    function template(spec) {
-      var t = originalTemplate(spec);
-      t.isTop = true;
-      return t;
-    }
-
-    __exports__.template = template;__exports__.normalizePath = normalizePath;
     __exports__.makeBoundHelper = makeBoundHelper;
-    __exports__.handlebarsGet = handlebarsGet;
     __exports__.handlebarsGetView = handlebarsGetView;
-    __exports__.evaluateUnboundHelper = evaluateUnboundHelper;
+    __exports__.handlebarsGet = handlebarsGet;
   });
-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__) {
+enifed("ember-handlebars/helpers/bind_attr",
+  ["ember-metal/core","ember-handlebars-compiler","ember-metal/utils","ember-runtime/system/string","ember-metal/array","ember-views/views/view","ember-metal/keys","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -7388,597 +7197,19 @@ enifed("ember-handlebars/helpers/binding",
     */
 
     var Ember = __dependency1__["default"];
-    // Ember.assert, Ember.warn, uuid
-    // var emberAssert = Ember.assert, Ember.warn = Ember.warn;
-
+    // Ember.assert
     var EmberHandlebars = __dependency2__["default"];
-    var get = __dependency3__.get;
-    var set = __dependency4__.set;
-    var apply = __dependency5__.apply;
-    var uuid = __dependency5__.uuid;
-    var fmt = __dependency6__.fmt;
-    var o_create = __dependency7__.create;
-    var isNone = __dependency8__["default"];
-    var EnumerableUtils = __dependency9__["default"];
-    var forEach = __dependency10__.forEach;
-    var View = __dependency11__["default"];
-    var run = __dependency12__["default"];
-    var removeObserver = __dependency13__.removeObserver;
-    var isGlobalPath = __dependency14__.isGlobalPath;
-    var emberBind = __dependency14__.bind;
-    var jQuery = __dependency15__["default"];
-    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 normalizePath = __dependency16__.normalizePath;
-    var handlebarsGet = __dependency16__.handlebarsGet;
-    var getEscaped = __dependency16__.getEscaped;
-
-    var guidFor = __dependency5__.guidFor;
-    var typeOf = __dependency5__.typeOf;
+    var uuid = __dependency3__.uuid;
+    var fmt = __dependency4__.fmt;
+    var typeOf = __dependency3__.typeOf;
+    var forEach = __dependency5__.forEach;
+    var View = __dependency6__["default"];
+    var keys = __dependency7__["default"];
 
     var helpers = EmberHandlebars.helpers;
     var SafeString = EmberHandlebars.SafeString;
 
-    function exists(value) {
-      return !isNone(value);
-    }
-
-    var WithView = _HandlebarsBoundView.extend({
-      init: function() {
-        var controller;
-
-        apply(this, this._super, arguments);
-
-        var keywords        = this.templateData.keywords;
-        var keywordName     = this.templateHash.keywordName;
-        var keywordPath     = this.templateHash.keywordPath;
-        var controllerName  = this.templateHash.controller;
-        var preserveContext = this.preserveContext;
-
-        if (controllerName) {
-          var previousContext = this.previousContext;
-          controller = this.container.lookupFactory('controller:'+controllerName).create({
-            parentController: previousContext,
-            target: previousContext
-          });
-
-          this._generatedController = controller;
-
-          if (!preserveContext) {
-            this.set('controller', controller);
-
-            this.valueNormalizerFunc = function(result) {
-                controller.set('model', result);
-                return controller;
-            };
-          } else {
-            var controllerPath = jQuery.expando + guidFor(controller);
-            keywords[controllerPath] = controller;
-            emberBind(keywords, controllerPath + '.model', keywordPath);
-            keywordPath = controllerPath;
-          }
-        }
-
-        if (preserveContext) {
-          emberBind(keywords, keywordName, keywordPath);
-        }
-
-      },
-      willDestroy: function() {
-        this._super();
-
-        if (this._generatedController) {
-          this._generatedController.destroy();
-        }
-      }
-    });
-
-    // 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;
-
-      // we relied on the behavior of calling without
-      // context to mean this === window, but when running
-      // "use strict", it's possible for this to === undefined;
-      var currentContext = this || window;
-
-      normalized = normalizePath(currentContext, property, data);
-
-      if (data.insideGroup) {
-        observer = function() {
-          while (view._contextView) {
-            view = view._contextView;
-          }
-          run.once(view, 'rerender');
-        };
-
-        var template, context;
-        var result = handlebarsGet(currentContext, property, options);
-
-        result = valueNormalizer ? valueNormalizer(result) : result;
-
-        context = preserveContext ? currentContext : result;
-        if (shouldDisplay(result)) {
-          template = fn;
-        } else if (inverse) {
-          template = inverse;
-        }
-
-        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
-        };
-
-        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);
-          }
-        }
-      }
-    }
-
-    function simpleBind(currentContext, property, options) {
-      var data = options.data;
-      var view = data.view;
-      var normalized, observer, pathRoot, output;
-
-      normalized = normalizePath(currentContext, property, data);
-      pathRoot = normalized.root;
-
-      // Set up observers for observable objects
-      if (pathRoot && ('object' === typeof pathRoot)) {
-        if (data.insideGroup) {
-          observer = function() {
-            while (view._contextView) {
-              view = view._contextView;
-            }
-            run.once(view, 'rerender');
-          };
-
-          output = handlebarsGetEscaped(currentContext, property, options);
-
-          data.buffer.push(output);
-        } else {
-          var bindView = new SimpleHandlebarsView(
-            property, currentContext, !options.hash.unescaped, options.data
-          );
-
-          bindView._parentView = view;
-          view.appendChild(bindView);
-
-          observer = function() {
-            run.scheduleOnce('render', bindView, 'rerender');
-          };
-        }
-
-        // 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);
-        }
-      } else {
-        // The object is not observable, so just render it out and
-        // be done with it.
-        output = handlebarsGetEscaped(currentContext, property, options);
-        data.buffer.push(output);
-      }
-    }
-
-    function shouldDisplayIfHelperContent(result) {
-      var truthy = result && get(result, 'isTruthy');
-      if (typeof truthy === 'boolean') { return truthy; }
-
-      if (isArray(result)) {
-        return get(result, 'length') !== 0;
-      } else {
-        return !!result;
-      }
-    }
-
-    /**
-      '_triageMustache' is used internally select between a binding, helper, or component for
-      the given context. Until this point, it would be hard to determine if the
-      mustache is a property reference or a regular helper reference. This triage
-      helper resolves that.
-
-      This would not be typically invoked by directly.
-
-      @private
-      @method _triageMustache
-      @for Ember.Handlebars.helpers
-      @param {String} property Property/helperID to triage
-      @param {Object} options hash of template/rendering options
-      @return {String} HTML string
-    */
-    function _triageMustacheHelper(property, options) {
-      Ember.assert("You cannot pass more than one argument to the _triageMustache helper", arguments.length <= 2);
-
-      var helper = EmberHandlebars.resolveHelper(options.data.view.container, property);
-      if (helper) {
-        return helper.call(this, options);
-      }
-
-      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:
-
-      * Look for a registered helper
-      * If a dash exists in the name:
-        * Look for a helper registed in the container
-        * Use Ember.ComponentLookup to find an Ember.Component that resolves
-          to the given name
-
-      @private
-      @method resolveHelper
-      @param {Container} container
-      @param {String} name the name of the helper to lookup
-      @return {Handlebars Helper}
-    */
-    function resolveHelper(container, name) {
-      if (helpers[name]) {
-        return helpers[name];
-      }
-
-      if (!container || ISNT_HELPER_CACHE.get(name)) {
-        return;
-      }
-
-      var helper = container.lookup('helper:' + name);
-      if (!helper) {
-        var componentLookup = container.lookup('component-lookup:main');
-        Ember.assert("Could not find 'component-lookup:main' on the provided container, which is necessary for performing component lookups", componentLookup);
-
-        var Component = componentLookup.lookupFactory(name, container);
-        if (Component) {
-          helper = EmberHandlebars.makeViewHelper(Component);
-          container.register('helper:' + name, helper);
-        }
-      }
-      return helper;
-    }
-
-
-    /**
-      `bind` can be used to display a value, then update that value if it
-      changes. For example, if you wanted to print the `title` property of
-      `content`:
-
-      ```handlebars
-      {{bind "content.title"}}
-      ```
-
-      This will return the `title` property as a string, then create a new observer
-      at the specified path. If it changes, it will update the value in DOM. Note
-      that if you need to support IE7 and IE8 you must modify the model objects
-      properties using `Ember.get()` and `Ember.set()` for this to work as it
-      relies on Ember's KVO system. For all other browsers this will be handled for
-      you automatically.
-
-      @private
-      @method bind
-      @for Ember.Handlebars.helpers
-      @param {String} property Property to bind
-      @param {Function} fn Context to provide for rendering
-      @return {String} HTML string
-    */
-    function bindHelper(property, options) {
-      Ember.assert("You cannot pass more than one argument to the bind helper", arguments.length <= 2);
-
-      var context = (options.contexts && options.contexts.length) ? options.contexts[0] : this;
-
-      if (!options.fn) {
-        return simpleBind(context, property, options);
-      }
-
-      options.helperName = 'bind';
-
-      return bind.call(context, property, options, false, exists);
-    }
-
-    /**
-      Use the `boundIf` helper to create a conditional that re-evaluates
-      whenever the truthiness of the bound value changes.
-
-      ```handlebars
-      {{#boundIf "content.shouldDisplayTitle"}}
-        {{content.title}}
-      {{/boundIf}}
-      ```
-
-      @private
-      @method boundIf
-      @for Ember.Handlebars.helpers
-      @param {String} property Property to bind
-      @param {Function} fn Context to provide for rendering
-      @return {String} HTML string
-    */
-    function boundIfHelper(property, fn) {
-      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this;
-
-      fn.helperName = fn.helperName || 'boundIf';
-
-      return bind.call(context, property, fn, true, shouldDisplayIfHelperContent, shouldDisplayIfHelperContent, ['isTruthy', 'length']);
-    }
-
-    /**
-      @private
-
-      Use the `unboundIf` helper to create a conditional that evaluates once.
-
-      ```handlebars
-      {{#unboundIf "content.shouldDisplayTitle"}}
-        {{content.title}}
-      {{/unboundIf}}
-      ```
-
-      @method unboundIf
-      @for Ember.Handlebars.helpers
-      @param {String} property Property to bind
-      @param {Function} fn Context to provide for rendering
-      @return {String} HTML string
-      @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;
-
-      normalized = normalizePath(context, property, data);
-      propertyValue = handlebarsGet(context, property, fn);
-
-      if (!shouldDisplayIfHelperContent(propertyValue)) {
-        template = inverse;
-      }
-
-      template(context, { data: data });
-    }
-
-    /**
-      Use the `{{with}}` helper when you want to scope context. Take the following code as an example:
-
-      ```handlebars
-      <h5>{{user.name}}</h5>
-
-      <div class="role">
-        <h6>{{user.role.label}}</h6>
-        <span class="role-id">{{user.role.id}}</span>
-
-        <p class="role-desc">{{user.role.description}}</p>
-      </div>
-      ```
-
-      `{{with}}` can be our best friend in these cases,
-      instead of writing `user.role.*` over and over, we use `{{#with user.role}}`.
-      Now the context within the `{{#with}} .. {{/with}}` block is `user.role` so you can do the following:
-
-      ```handlebars
-      <h5>{{user.name}}</h5>
-
-      <div class="role">
-        {{#with user.role}}
-          <h6>{{label}}</h6>
-          <span class="role-id">{{id}}</span>
-
-          <p class="role-desc">{{description}}</p>
-        {{/with}}
-      </div>
-      ```
-
-      ### `as` operator
-
-      This operator aliases the scope to a new name. It's helpful for semantic clarity and to retain
-      default scope or to reference from another `{{with}}` block.
-
-      ```handlebars
-      // posts might not be
-      {{#with user.posts as blogPosts}}
-        <div class="notice">
-          There are {{blogPosts.length}} blog posts written by {{user.name}}.
-        </div>
-
-        {{#each post in blogPosts}}
-          <li>{{post.title}}</li>
-        {{/each}}
-      {{/with}}
-      ```
-
-      Without the `as` operator, it would be impossible to reference `user.name` in the example above.
-
-      NOTE: The alias should not reuse a name from the bound property path.
-      For example: `{{#with foo.bar as foo}}` is not supported because it attempts to alias using
-      the first part of the property path, `foo`. Instead, use `{{#with foo.bar as baz}}`.
-
-      ### `controller` option
-
-      Adding `controller='something'` instructs the `{{with}}` helper to create and use an instance of
-      the specified controller with the new context as its content.
-
-      This is very similar to using an `itemController` option with the `{{each}}` helper.
-
-      ```handlebars
-      {{#with users.posts controller='userBlogPosts'}}
-        {{!- The current context is wrapped in our controller instance }}
-      {{/with}}
-      ```
-
-      In the above example, the template provided to the `{{with}}` block is now wrapped in the
-      `userBlogPost` controller, which provides a very elegant way to decorate the context with custom
-      functions/properties.
-
-      @method with
-      @for Ember.Handlebars.helpers
-      @param {Function} context
-      @param {Hash} options
-      @return {String} HTML string
-    */
-    function withHelper(context, options) {
-      var bindContext, preserveContext, controller;
-      var helperName = 'with';
-
-      if (arguments.length === 4) {
-        var keywordName, path, rootPath, normalized, contextPath;
-
-        Ember.assert("If you pass more than one argument to the with helper, it must be in the form #with foo as bar", arguments[1] === "as");
-        options = arguments[3];
-        keywordName = arguments[2];
-        path = arguments[0];
-
-        if (path) {
-          helperName += ' ' + path + ' as ' + keywordName;
-        }
-
-        Ember.assert("You must pass a block to the with helper", options.fn && options.fn !== Handlebars.VM.noop);
-
-        var localizedOptions = o_create(options);
-        localizedOptions.data = o_create(options.data);
-        localizedOptions.data.keywords = o_create(options.data.keywords || {});
-
-        if (isGlobalPath(path)) {
-          contextPath = path;
-        } else {
-          normalized = normalizePath(this, path, options.data);
-          path = normalized.path;
-          rootPath = normalized.root;
-
-          // This is a workaround for the fact that you cannot bind separate objects
-          // together. When we implement that functionality, we should use it here.
-          var contextKey = jQuery.expando + guidFor(rootPath);
-          localizedOptions.data.keywords[contextKey] = rootPath;
-          // if the path is '' ("this"), just bind directly to the current context
-          contextPath = path ? contextKey + '.' + path : contextKey;
-        }
-
-        localizedOptions.hash.keywordName = keywordName;
-        localizedOptions.hash.keywordPath = contextPath;
-
-        bindContext = this;
-        context = contextPath;
-        options = localizedOptions;
-        preserveContext = true;
-      } else {
-        Ember.assert("You must pass exactly one argument to the with helper", arguments.length === 2);
-        Ember.assert("You must pass a block to the with helper", options.fn && options.fn !== Handlebars.VM.noop);
-
-        helperName += ' ' + context;
-        bindContext = options.contexts[0];
-        preserveContext = false;
-      }
-
-      options.helperName = helperName;
-      options.isWithHelper = true;
-
-      return bind.call(bindContext, context, options, preserveContext, exists);
-    }
-    /**
-      See [boundIf](/api/classes/Ember.Handlebars.helpers.html#method_boundIf)
-      and [unboundIf](/api/classes/Ember.Handlebars.helpers.html#method_unboundIf)
-
-      @method if
-      @for Ember.Handlebars.helpers
-      @param {Function} context
-      @param {Hash} options
-      @return {String} HTML string
-    */
-    function ifHelper(context, options) {
-      Ember.assert("You must pass exactly one argument to the if helper", arguments.length === 2);
-      Ember.assert("You must pass a block to the if helper", options.fn && options.fn !== Handlebars.VM.noop);
-
-      options.helperName = options.helperName || ('if ' + context);
-
-      if (options.data.isUnbound) {
-        return helpers.unboundIf.call(options.contexts[0], context, options);
-      } else {
-        return helpers.boundIf.call(options.contexts[0], context, options);
-      }
-    }
-
-    /**
-      @method unless
-      @for Ember.Handlebars.helpers
-      @param {Function} context
-      @param {Hash} options
-      @return {String} HTML string
-    */
-    function unlessHelper(context, options) {
-      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';
-
-      if (context) {
-        helperName += ' ' + context;
-      }
-
-      options.fn = inverse;
-      options.inverse = fn;
-
-      options.helperName = options.helperName || helperName;
-
-      if (options.data.isUnbound) {
-        return helpers.unboundIf.call(options.contexts[0], context, options);
-      } else {
-        return helpers.boundIf.call(options.contexts[0], context, options);
-      }
-    }
-
     /**
       `bind-attr` allows you to create a binding between DOM element attributes and
       Ember objects. For example:
@@ -8135,21 +7366,19 @@ enifed("ember-handlebars/helpers/binding",
       // current value of the property as an attribute.
       forEach.call(attrKeys, function(attr) {
         var path = attrs[attr];
-        var normalized;
 
-        Ember.assert(fmt("You must provide an expression as the value of bound attribute. You specified: %@=%@", [attr, path]), typeof path === 'string');
+        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 lazyValue = view.getStream(path);
+        var value = lazyValue.value();
         var 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');
+        Ember.assert(fmt("Attributes must be numbers, strings or booleans, not %@", [value]), 
+                     value === null || value === undefined || type === 'number' || type === 'string' || type === 'boolean');
 
-        var observer;
-
-        observer = function observer() {
-          var result = handlebarsGet(ctx, path, options);
+        lazyValue.subscribe(view._wrapAsScheduled(function applyAttributeBindings() {
+          var result = lazyValue.value();
 
           Ember.assert(fmt("Attributes must be numbers, strings or booleans, not %@", [result]),
                        result === null || result === undefined || typeof result === 'number' ||
@@ -8157,26 +7386,10 @@ enifed("ember-handlebars/helpers/binding",
 
           var elem = view.$("[data-bindattr-" + dataId + "='" + dataId + "']");
 
-          // If we aren't able to find the element, it means the element
-          // to which we were bound has been removed from the view.
-          // In that case, we can assume the template has been re-rendered
-          // and we need to clean up the observer.
-          if (!elem || elem.length === 0) {
-            removeObserver(normalized.root, normalized.path, observer);
-            return;
-          }
+          Ember.assert("An attribute binding was triggered when the element was not in the DOM", elem && elem.length !== 0);
 
           View.applyAttributeBindings(elem, attr, result);
-        };
-
-        // Add an observer to the view for when the property changes.
-        // When the observer fires, find the element using the
-        // unique data id and update the attribute to the new value.
-        // Note: don't add observer when path is 'this' or path
-        // is whole keyword e.g. {{#each x in list}} ... {{bind-attr attr="x"}}
-        if (path !== 'this' && !(normalized.isKeyword && normalized.path === '' )) {
-          view.registerObserver(normalized.root, normalized.path, observer);
-        }
+        }));
 
         // if this changes, also change the logic in ember-views/lib/views/view.js
         if ((type === 'string' || (type === 'number' && !isNaN(value)))) {
@@ -8204,7 +7417,8 @@ enifed("ember-handlebars/helpers/binding",
       @return {String} HTML string
     */
     function bindAttrHelperDeprecated() {
-      Ember.warn("The 'bindAttr' view helper is deprecated in favor of 'bind-attr'");
+      Ember.deprecate("The 'bindAttr' view helper is deprecated in favor of 'bind-attr'");
+
       return helpers['bind-attr'].apply(this, arguments);
     }
 
@@ -8235,24 +7449,6 @@ enifed("ember-handlebars/helpers/binding",
       var ret = [];
       var 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;
-
-        if (path === 'this') {
-          val = root;
-        } else if (path === '') {
-          val = true;
-        } else {
-          val = handlebarsGet(root, path, options);
-        }
-
-        return View._classStringForValue(path, val, parsedPath.className, parsedPath.falsyClassName);
-      };
-
       // For each property passed, loop through and setup
       // an observer.
       forEach.call(classBindings.split(' '), function(binding) {
@@ -8261,31 +7457,26 @@ 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 initialValue;
 
-        if (path !== '' && path !== 'this') {
-          normalized = normalizePath(context, path, options.data);
+        if (path === '') {
+          initialValue = true;
+        } else {
+          var lazyValue = view.getStream(path);
+          initialValue = lazyValue.value();
 
-          pathRoot = normalized.root;
-          path = normalized.path;
-        }
+          // Set up an observer on the context. If the property changes, toggle the
+          // class name.
+          lazyValue.subscribe(view._wrapAsScheduled(function applyClassNameBindings() {
+            // Get the current value of the property
+            var value = lazyValue.value();
+            newClass = classStringForParsedPath(parsedPath, value);
+            elem = bindAttrId ? view.$("[data-bindattr-" + bindAttrId + "='" + bindAttrId + "']") : view.$();
 
-        // Set up an observer on the context. If the property changes, toggle the
-        // class name.
-        observer = function() {
-          // Get the current value of the property
-          newClass = classStringForPath(context, parsedPath, options);
-          elem = bindAttrId ? view.$("[data-bindattr-" + bindAttrId + "='" + bindAttrId + "']") : view.$();
+            Ember.assert("A class name binding was triggered when the element was not in the DOM", elem && elem.length !== 0);
 
-          // If we can't find the element anymore, a parent template has been
-          // re-rendered and we've been nuked. Remove the observer.
-          if (!elem || elem.length === 0) {
-            removeObserver(pathRoot, path, observer);
-          } else {
             // If we had previously added a class to the element, remove it.
             if (oldClass) {
               elem.removeClass(oldClass);
@@ -8299,16 +7490,12 @@ enifed("ember-handlebars/helpers/binding",
             } else {
               oldClass = null;
             }
-          }
-        };
-
-        if (path !== '' && path !== 'this') {
-          view.registerObserver(pathRoot, path, observer);
+          }));
         }
 
         // We've already setup the observer; now we just need to figure out the
         // correct behavior right now on the first pass through.
-        value = classStringForPath(context, parsedPath, options);
+        value = classStringForParsedPath(parsedPath, initialValue);
 
         if (value) {
           ret.push(value);
@@ -8322,22 +7509,238 @@ enifed("ember-handlebars/helpers/binding",
       return ret;
     }
 
-    __exports__.bind = bind;
-    __exports__._triageMustacheHelper = _triageMustacheHelper;
-    __exports__.resolveHelper = resolveHelper;
-    __exports__.bindHelper = bindHelper;
-    __exports__.boundIfHelper = boundIfHelper;
-    __exports__.unboundIfHelper = unboundIfHelper;
-    __exports__.withHelper = withHelper;
-    __exports__.ifHelper = ifHelper;
-    __exports__.unlessHelper = unlessHelper;
+    function classStringForParsedPath(parsedPath, value) {
+      return View._classStringForValue(parsedPath.path, value, parsedPath.className, parsedPath.falsyClassName);
+    }
+
+    __exports__["default"] = bindAttrHelper;
+
     __exports__.bindAttrHelper = bindAttrHelper;
     __exports__.bindAttrHelperDeprecated = bindAttrHelperDeprecated;
     __exports__.bindClasses = bindClasses;
   });
+enifed("ember-handlebars/helpers/binding",
+  ["ember-metal/core","ember-handlebars-compiler","ember-metal/is_none","ember-metal/run_loop","ember-metal/cache","ember-metal/streams/simple","ember-handlebars/views/handlebars_bound_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var EmberHandlebars = __dependency2__["default"];
+
+    var isNone = __dependency3__["default"];
+    var run = __dependency4__["default"];
+    var Cache = __dependency5__["default"];
+    var SimpleStream = __dependency6__["default"];
+
+    var _HandlebarsBoundView = __dependency7__._HandlebarsBoundView;
+    var SimpleHandlebarsView = __dependency7__.SimpleHandlebarsView;
+
+    var helpers = EmberHandlebars.helpers;
+
+    function exists(value) {
+      return !isNone(value);
+    }
+
+    // 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, _viewClass) {
+      var data = options.data;
+      var view = data.view;
+
+      // we relied on the behavior of calling without
+      // context to mean this === window, but when running
+      // "use strict", it's possible for this to === undefined;
+      var currentContext = this || window;
+
+      var valueStream = view.getStream(property);
+      var lazyValue;
+
+      if (childProperties) {
+        lazyValue = new SimpleStream(valueStream);
+
+        var subscriber = function(childStream) {
+          childStream.value();
+          lazyValue.notify();
+        };
+
+        for (var i = 0; i < childProperties.length; i++) {
+          var childStream = valueStream.get(childProperties[i]);
+          childStream.value();
+          childStream.subscribe(subscriber);
+        }
+      } else {
+        lazyValue = valueStream;
+      }
+
+      // Set up observers for observable objects
+      var viewClass = _viewClass || _HandlebarsBoundView;
+      var viewOptions = {
+        preserveContext: preserveContext,
+        shouldDisplayFunc: shouldDisplay,
+        valueNormalizerFunc: valueNormalizer,
+        displayTemplate: options.fn,
+        inverseTemplate: options.inverse,
+        lazyValue: lazyValue,
+        previousContext: currentContext,
+        isEscaped: !options.hash.unescaped,
+        templateData: options.data,
+        templateHash: options.hash,
+        helperName: options.helperName
+      };
+
+      if (options.keywords) {
+        viewOptions._keywords = options.keywords;
+      }
+
+      // 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);
+
+      lazyValue.subscribe(view._wrapAsScheduled(function() {
+        run.scheduleOnce('render', bindView, 'rerenderIfNeeded');
+      }));
+    }
+
+    function simpleBind(currentContext, lazyValue, options) {
+      var data = options.data;
+      var view = data.view;
+
+      var bindView = new SimpleHandlebarsView(
+        lazyValue, !options.hash.unescaped
+      );
+
+      bindView._parentView = view;
+      view.appendChild(bindView);
+
+      lazyValue.subscribe(view._wrapAsScheduled(function() {
+        run.scheduleOnce('render', bindView, 'rerender');
+      }));
+    }
+
+    /**
+      '_triageMustache' is used internally select between a binding, helper, or component for
+      the given context. Until this point, it would be hard to determine if the
+      mustache is a property reference or a regular helper reference. This triage
+      helper resolves that.
+
+      This would not be typically invoked by directly.
+
+      @private
+      @method _triageMustache
+      @for Ember.Handlebars.helpers
+      @param {String} property Property/helperID to triage
+      @param {Object} options hash of template/rendering options
+      @return {String} HTML string
+    */
+    function _triageMustacheHelper(property, options) {
+      Ember.assert("You cannot pass more than one argument to the _triageMustache helper", arguments.length <= 2);
+
+      var helper = EmberHandlebars.resolveHelper(options.data.view.container, property);
+      if (helper) {
+        return helper.call(this, options);
+      }
+
+      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:
+
+      * Look for a registered helper
+      * If a dash exists in the name:
+        * Look for a helper registed in the container
+        * Use Ember.ComponentLookup to find an Ember.Component that resolves
+          to the given name
+
+      @private
+      @method resolveHelper
+      @param {Container} container
+      @param {String} name the name of the helper to lookup
+      @return {Handlebars Helper}
+    */
+    function resolveHelper(container, name) {
+      if (helpers[name]) {
+        return helpers[name];
+      }
+
+      if (!container || ISNT_HELPER_CACHE.get(name)) {
+        return;
+      }
+
+      var helper = container.lookup('helper:' + name);
+      if (!helper) {
+        var componentLookup = container.lookup('component-lookup:main');
+        Ember.assert("Could not find 'component-lookup:main' on the provided container," +
+                     " which is necessary for performing component lookups", componentLookup);
+
+        var Component = componentLookup.lookupFactory(name, container);
+        if (Component) {
+          helper = EmberHandlebars.makeViewHelper(Component);
+          container.register('helper:' + name, helper);
+        }
+      }
+      return helper;
+    }
+
+
+    /**
+      `bind` can be used to display a value, then update that value if it
+      changes. For example, if you wanted to print the `title` property of
+      `content`:
+
+      ```handlebars
+      {{bind "content.title"}}
+      ```
+
+      This will return the `title` property as a string, then create a new observer
+      at the specified path. If it changes, it will update the value in DOM. Note
+      that if you need to support IE7 and IE8 you must modify the model objects
+      properties using `Ember.get()` and `Ember.set()` for this to work as it
+      relies on Ember's KVO system. For all other browsers this will be handled for
+      you automatically.
+
+      @private
+      @method bind
+      @for Ember.Handlebars.helpers
+      @param {String} property Property to bind
+      @param {Function} fn Context to provide for rendering
+      @return {String} HTML string
+    */
+    function bindHelper(property, options) {
+      Ember.assert("You cannot pass more than one argument to the bind helper", arguments.length <= 2);
+
+      var context = (options.contexts && options.contexts.length) ? options.contexts[0] : this;
+
+      if (!options.fn) {
+        var lazyValue = options.data.view.getStream(property);
+        return simpleBind(context, lazyValue, options);
+      }
+
+      options.helperName = 'bind';
+
+      return bind.call(context, property, options, false, exists);
+    }
+
+    __exports__.bind = bind;
+    __exports__._triageMustacheHelper = _triageMustacheHelper;
+    __exports__.resolveHelper = resolveHelper;
+    __exports__.bindHelper = bindHelper;
+  });
 enifed("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__) {
+  ["ember-metal/core","ember-handlebars-compiler","ember-metal/mixin","ember-runtime/system/string","ember-metal/property_get","ember-metal/streams/simple","ember-handlebars/ext","ember-handlebars/helpers/view","ember-views/views/view","ember-views/views/collection_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -8346,23 +7749,21 @@ enifed("ember-handlebars/helpers/collection",
 
     var Ember = __dependency1__["default"];
     // Ember.assert, Ember.deprecate
-    var inspect = __dependency2__.inspect;
 
     // var emberAssert = Ember.assert;
         // emberDeprecate = Ember.deprecate;
 
-    var EmberHandlebars = __dependency3__["default"];
-    var helpers = EmberHandlebars.helpers;
+    var EmberHandlebars = __dependency2__["default"];
 
+    var IS_BINDING = __dependency3__.IS_BINDING;
     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"];
+    var SimpleStream = __dependency6__["default"];
+    var handlebarsGetView = __dependency7__.handlebarsGetView;
+    var ViewHelper = __dependency8__.ViewHelper;
+    var View = __dependency9__["default"];
+    var CollectionView = __dependency10__["default"];
 
-    var alias = computed.alias;
     /**
       `{{collection}}` is a `Ember.Handlebars` helper for adding instances of
       `Ember.CollectionView` to a template. See [Ember.CollectionView](/api/classes/Ember.CollectionView.html)
@@ -8490,7 +7891,8 @@ enifed("ember-handlebars/helpers/collection",
       @deprecated Use `{{each}}` helper instead.
     */
     function collectionHelper(path, options) {
-      Ember.deprecate("Using the {{collection}} helper without specifying a class has been deprecated as the {{each}} helper now supports the same functionality.", path !== 'collection');
+      Ember.deprecate("Using the {{collection}} helper without specifying a class has been" +
+                      " deprecated as the {{each}} helper now supports the same functionality.", path !== 'collection');
 
       // If no path is provided, treat path param as options.
       if (path && path.data && path.data.isRenderData) {
@@ -8513,7 +7915,7 @@ enifed("ember-handlebars/helpers/collection",
       // Otherwise, just default to the standard class.
       var collectionClass;
       if (path) {
-        collectionClass = handlebarsGetView(this, path, container, options);
+        collectionClass = handlebarsGetView(this, path, container, options.data);
         Ember.assert(fmt("%@ #collection: Could not find collection class %@", [data.view, path]), !!collectionClass);
       }
       else {
@@ -8521,6 +7923,7 @@ enifed("ember-handlebars/helpers/collection",
       }
 
       var hash = options.hash;
+      var hashTypes = options.hashTypes;
       var itemHash = {};
       var match;
 
@@ -8529,29 +7932,46 @@ enifed("ember-handlebars/helpers/collection",
       var itemViewClass;
 
       if (hash.itemView) {
-        itemViewClass = handlebarsGetView(this, hash.itemView, container, options);
+        itemViewClass = hash.itemView;
       } else if (hash.itemViewClass) {
-        itemViewClass = handlebarsGetView(collectionPrototype, hash.itemViewClass, container, options);
+        if (hashTypes.itemViewClass === 'ID') {
+          var itemViewClassStream = view.getStream(hash.itemViewClass);
+          Ember.deprecate('Resolved the view "'+hash.itemViewClass+'" 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', !itemViewClassStream.isGlobal());
+          itemViewClass = itemViewClassStream.value();
+        } else {
+          itemViewClass = hash.itemViewClass;
+        }
       } else {
-        itemViewClass = handlebarsGetView(collectionPrototype, collectionPrototype.itemViewClass, container, options);
+        itemViewClass = collectionPrototype.itemViewClass;
+      }
+
+      if (typeof itemViewClass === 'string') {
+        itemViewClass = container.lookupFactory('view:'+itemViewClass);
       }
 
       Ember.assert(fmt("%@ #collection: Could not find itemViewClass %@", [data.view, itemViewClass]), !!itemViewClass);
 
       delete hash.itemViewClass;
       delete hash.itemView;
+      delete hashTypes.itemViewClass;
+      delete hashTypes.itemView;
 
       // Go through options passed to the {{collection}} helper and extract options
       // that configure item views instead of the collection itself.
       for (var prop in hash) {
+        if (prop === 'itemController' || prop === 'itemClassBinding') {
+          continue;
+        }
         if (hash.hasOwnProperty(prop)) {
           match = prop.match(/^item(.)(.*)$/);
+          if (match) {
+            var childProp = match[1].toLowerCase() + match[2];
 
-          if (match && prop !== 'itemController') {
-            // Convert itemShouldFoo -> shouldFoo
-            itemHash[match[1].toLowerCase() + match[2]] = hash[prop];
-            // Delete from hash as this will end up getting passed to the
-            // {{view}} helper method.
+            if (hashTypes[prop] === 'ID' || IS_BINDING.test(prop)) {
+              itemHash[childProp] = view._getBindingForStream(hash[prop]);
+            } else {
+              itemHash[childProp] = hash[prop];
+            }
             delete hash[prop];
           }
         }
@@ -8570,29 +7990,47 @@ enifed("ember-handlebars/helpers/collection",
               tagName: itemHash.tagName
         });
       } else if (hash.emptyViewClass) {
-        emptyViewClass = handlebarsGetView(this, hash.emptyViewClass, container, options);
+        emptyViewClass = handlebarsGetView(this, hash.emptyViewClass, container, options.data);
       }
       if (emptyViewClass) { hash.emptyView = emptyViewClass; }
 
       if (hash.keyword) {
-        itemHash._context = this;
+        itemHash._contextBinding = '_parentView.context';
       } else {
-        itemHash._context = alias('content');
+        itemHash._contextBinding = 'content';
       }
 
       var viewOptions = ViewHelper.propertiesFromHTMLOptions({ data: data, hash: itemHash }, this);
-      hash.itemViewClass = itemViewClass.extend(viewOptions);
+
+      if (hash.itemClassBinding) {
+        var itemClassBindings = hash.itemClassBinding.split(' ');
+
+        for (var i = 0; i < itemClassBindings.length; i++) {
+          var parsedPath = View._parsePropertyPath(itemClassBindings[i]);
+          if (parsedPath.path === '') {
+            parsedPath.stream = new SimpleStream(true);
+          } else {
+            parsedPath.stream = view.getStream(parsedPath.path);
+          }
+          itemClassBindings[i] = parsedPath;
+        }
+
+        viewOptions.classNameBindings = itemClassBindings;
+      }
+
+      hash.itemViewClass = itemViewClass;
+      hash._itemViewProps = viewOptions;
 
       options.helperName = options.helperName || 'collection';
 
-      return helpers.view.call(this, collectionClass, options);
+      return EmberHandlebars.helpers.view.call(this, collectionClass, options);
     }
 
     __exports__["default"] = collectionHelper;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/utils","ember-metal/logger","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     /*jshint debug:true*/
 
@@ -8605,10 +8043,6 @@ enifed("ember-handlebars/helpers/debug",
     var inspect = __dependency2__.inspect;
     var Logger = __dependency3__["default"];
 
-    var get = __dependency4__.get;
-    var normalizePath = __dependency5__.normalizePath;
-    var handlebarsGet = __dependency5__.handlebarsGet;
-
     var a_slice = [].slice;
 
     /**
@@ -8626,22 +8060,14 @@ enifed("ember-handlebars/helpers/debug",
     function logHelper() {
       var params = a_slice.call(arguments, 0, -1);
       var options = arguments[arguments.length - 1];
+      var view = options.data.view;
       var logger = Logger.log;
       var values = [];
-      var 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);
-
-          if (normalized.path === 'this') {
-            values.push(normalized.root);
-          } else {
-            values.push(handlebarsGet(normalized.root, normalized.path, options));
-          }
+        if (options.types[i] === 'ID') {
+          var stream = view.getStream(params[i]);
+          values.push(stream.value());
         } else {
           values.push(params[i]);
         }
@@ -8687,6 +8113,7 @@ enifed("ember-handlebars/helpers/debug",
     function debuggerHelper(options) {
 
       // These are helpful values you can inspect while debugging.
+      /* jshint unused: false */
       var templateContext = this;
       var typeOfTemplateContext = inspect(templateContext);
       Ember.Logger.info('Use `this` to access the context of the calling template.');
@@ -8698,8 +8125,8 @@ enifed("ember-handlebars/helpers/debug",
     __exports__.debuggerHelper = debuggerHelper;
   });
 enifed("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__) {
+  ["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-metal/observer","ember-handlebars/views/metamorph_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
 
     /**
@@ -8708,10 +8135,8 @@ enifed("ember-handlebars/helpers/each",
     */
     var Ember = __dependency1__["default"];
     // Ember.assert;, Ember.K
-    var K = Ember.K;
 
     var EmberHandlebars = __dependency2__["default"];
-    var helpers = EmberHandlebars.helpers;
 
     var fmt = __dependency3__.fmt;
     var get = __dependency4__.get;
@@ -8721,19 +8146,14 @@ enifed("ember-handlebars/helpers/each",
     var ControllerMixin = __dependency8__["default"];
     var ArrayController = __dependency9__["default"];
     var EmberArray = __dependency10__["default"];
-    var copy = __dependency11__["default"];
-    var run = __dependency12__["default"];
-    var on = __dependency13__.on;
-    var handlebarsGet = __dependency14__.handlebarsGet;
-    var computed = __dependency15__.computed;
 
-    var addObserver = __dependency16__.addObserver;
-    var removeObserver = __dependency16__.removeObserver;
-    var addBeforeObserver = __dependency16__.addBeforeObserver;
-    var removeBeforeObserver = __dependency16__.removeBeforeObserver;
+    var addObserver = __dependency11__.addObserver;
+    var removeObserver = __dependency11__.removeObserver;
+    var addBeforeObserver = __dependency11__.addBeforeObserver;
+    var removeBeforeObserver = __dependency11__.removeBeforeObserver;
 
-    var _Metamorph = __dependency17__._Metamorph;
-    var _MetamorphView = __dependency17__._MetamorphView;
+    var _MetamorphView = __dependency12__["default"];
+    var _Metamorph = __dependency12__._Metamorph;
 
     var EachView = CollectionView.extend(_Metamorph, {
 
@@ -8774,7 +8194,11 @@ enifed("ember-handlebars/helpers/each",
                          !ControllerMixin.detect(content) ||
                            (content && content.isGenerated) ||
                            content instanceof ArrayController);
-        Ember.assert(fmt("The value that #each loops over must be an Array. You passed %@", [(ControllerMixin.detect(content) && content.get('model') !== undefined) ? fmt("'%@' (wrapped in %@)", [content.get('model'), content]) : content]), EmberArray.detect(content));
+        Ember.assert(fmt("The value that #each loops over must be an Array. You passed %@",
+                         [(ControllerMixin.detect(content) &&
+                           content.get('model') !== undefined) ?
+                           fmt("'%@' (wrapped in %@)", [content.get('model'), content]) : content]),
+                         EmberArray.detect(content));
       },
 
       disableContentObservers: function(callback) {
@@ -8793,22 +8217,11 @@ enifed("ember-handlebars/helpers/each",
       createChildView: function(view, attrs) {
         view = this._super(view, attrs);
 
-        // At the moment, if a container view subclass wants
-        // to insert keywords, it is responsible for cloning
-        // the keywords hash. This will be fixed momentarily.
-        var keyword = get(this, 'keyword');
         var content = get(view, 'content');
+        var keyword = get(this, 'keyword');
 
         if (keyword) {
-          var data = get(view, 'templateData');
-
-          data = copy(data);
-          data.keywords = view.cloneKeywords();
-          set(view, 'templateData', data);
-
-          // In this case, we do not bind, because the `content` of
-          // a #each item cannot change.
-          data.keywords[keyword] = content;
+          view._keywords[keyword] = content;
         }
 
         // If {{#each}} is looping over an array of controllers,
@@ -8833,133 +8246,17 @@ enifed("ember-handlebars/helpers/each",
       }
     });
 
-    var GroupedEach = EmberHandlebars.GroupedEach = function(context, path, options) {
-      var self = this;
-      var normalized = EmberHandlebars.normalizePath(context, path, options.data);
-
-      this.context = context;
-      this.path = path;
-      this.options = options;
-      this.template = options.fn;
-      this.containingView = options.data.view;
-      this.normalizedRoot = normalized.root;
-      this.normalizedPath = normalized.path;
-      this.content = this.lookupContent();
-
-      this.addContentObservers();
-      this.addArrayObservers();
-
-      this.containingView.on('willClearRender', function() {
-        self.destroy();
-      });
-    };
-
-    GroupedEach.prototype = {
-      contentWillChange: function() {
-        this.removeArrayObservers();
-      },
-
-      contentDidChange: function() {
-        this.content = this.lookupContent();
-        this.addArrayObservers();
-        this.rerenderContainingView();
-      },
-
-      contentArrayWillChange: K,
-
-      contentArrayDidChange: function() {
-        this.rerenderContainingView();
-      },
-
-      lookupContent: function() {
-        return handlebarsGet(this.normalizedRoot, this.normalizedPath, this.options);
-      },
-
-      addArrayObservers: function() {
-        if (!this.content) { return; }
-
-        this.content.addArrayObserver(this, {
-          willChange: 'contentArrayWillChange',
-          didChange: 'contentArrayDidChange'
-        });
-      },
-
-      removeArrayObservers: function() {
-        if (!this.content) { return; }
-
-        this.content.removeArrayObserver(this, {
-          willChange: 'contentArrayWillChange',
-          didChange: 'contentArrayDidChange'
-        });
-      },
-
-      addContentObservers: function() {
-        addBeforeObserver(this.normalizedRoot, this.normalizedPath, this, this.contentWillChange);
-        addObserver(this.normalizedRoot, this.normalizedPath, this, this.contentDidChange);
-      },
-
-      removeContentObservers: function() {
-        removeBeforeObserver(this.normalizedRoot, this.normalizedPath, this.contentWillChange);
-        removeObserver(this.normalizedRoot, this.normalizedPath, this.contentDidChange);
-      },
-
-      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;
-
-        data.insideEach = true;
-        for (var i = 0; i < contentLength; i++) {
-          var context = content.objectAt(i);
-          options.data.keywords[options.hash.keyword] = context;
-          template(context, { data: data });
-        }
-      },
-
-      rerenderContainingView: function() {
-        var self = this;
-        run.scheduleOnce('render', this, function() {
-          // It's possible it's been destroyed after we enqueued a re-render call.
-          if (!self.destroyed) {
-            self.containingView.rerender();
-          }
-        });
-      },
-
-      destroy: function() {
-        this.removeContentObservers();
-        if (this.content) {
-          this.removeArrayObservers();
-        }
-        this.destroyed = true;
-      }
-    };
-
     /**
       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.
+      item in an array.
 
       ```javascript
       var developers = [{name: 'Yehuda'},{name: 'Tom'}, {name: 'Paul'}];
       ```
 
-      ```handlebars
-      {{#each developers}}
-        {{name}}
-        {{! `this` is each developer }}
-      {{/each}}
-      ```
-
-      `{{#each}}` supports an alternative syntax with element naming. This preserves
-      context of the yielded block:
-
       ```handlebars
       {{#each person in developers}}
         {{person.name}}
@@ -8975,8 +8272,8 @@ enifed("ember-handlebars/helpers/each",
       ```
 
       ```handlebars
-      {{#each developerNames}}
-        {{this}}
+      {{#each name in developerNames}}
+        {{name}}
       {{/each}}
       ```
 
@@ -9002,8 +8299,8 @@ enifed("ember-handlebars/helpers/each",
 
       ```handlebars
       <ul>
-      {{#each developers itemViewClass="person"}}
-        {{name}}
+      {{#each developer in developers itemViewClass="person"}}
+        {{developer.name}}
       {{/each}}
       </ul>
       ```
@@ -9034,13 +8331,13 @@ enifed("ember-handlebars/helpers/each",
       ```javascript
       App.PersonView = Ember.View.extend({
         tagName: 'li',
-        template: '{{name}}'
+        template: '{{developer.name}}'
       });
       ```
 
       ```handlebars
       <ul>
-        {{each developers itemViewClass="person"}}
+        {{each developer in developers itemViewClass="person"}}
       </ul>
       ```
 
@@ -9058,8 +8355,8 @@ enifed("ember-handlebars/helpers/each",
 
       ```handlebars
       <ul>
-      {{#each developers emptyViewClass="no-people"}}
-        <li>{{name}}</li>
+      {{#each developer in developers emptyViewClass="no-people"}}
+        <li>{{developer.name}}</li>
       {{/each}}
       </ul>
       ```
@@ -9090,47 +8387,6 @@ enifed("ember-handlebars/helpers/each",
       {{/each}}
       ```
 
-      ### (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).
-
-      ```handlebars
-      {{#group}}
-        {{#each people}}
-          {{firstName}} {{lastName}}
-        {{/each}}
-      {{/group}}
-      ```
-
-      When the membership of `people` changes, or when any property changes, the entire
-      `{{#group}}` block will be re-rendered.
-
-      An `{{#each}}` inside the `{{#group}}` helper can opt-out of the special group
-      behavior by passing the `groupedRows` option. For example:
-
-      ```handlebars
-      {{#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 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.
-
       @method each
       @for Ember.Handlebars.helpers
       @param [name] {String} name for item (used with `in`)
@@ -9139,54 +8395,193 @@ enifed("ember-handlebars/helpers/each",
       @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;
+    function eachHelper(path) {
+      var options = arguments[arguments.length - 1];
       var helperName = 'each';
+      var keywordName;
 
       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");
+        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");
 
-        var keywordName = arguments[0];
-
-
-        options = arguments[3];
+        keywordName = arguments[0];
         path = arguments[2];
 
         helperName += ' ' + keywordName + ' in ' + path;
 
-        if (path === '') { path = "this"; }
-
         options.hash.keyword = keywordName;
-
       } else if (arguments.length === 1) {
-        options = path;
-        path = 'this';
+        path = '';
       } else {
         helperName += ' ' + path;
       }
 
+      Ember.deprecate('Using the context switching form of {{each}} is deprecated. Please use the keyword form (`{{#each foo in bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.', keywordName);
+
+      options.hash.emptyViewClass = Ember._MetamorphView;
       options.hash.dataSourceBinding = path;
-      // Set up emptyView as a metamorph with no tag
-      //options.hash.emptyViewClass = Ember._MetamorphView;
-
-      // can't rely on this default behavior when use strict
-      ctx = this || window;
-
+      options.hashTypes.dataSourceBinding = 'STRING';
       options.helperName = options.helperName || helperName;
 
-      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);
-      }
+      return EmberHandlebars.helpers.collection.call(this, EmberHandlebars.EachView, options);
     }
 
     __exports__.EachView = EachView;
-    __exports__.GroupedEach = GroupedEach;
     __exports__.eachHelper = eachHelper;
   });
+enifed("ember-handlebars/helpers/if_unless",
+  ["ember-metal/core","ember-handlebars-compiler","ember-handlebars/helpers/binding","ember-metal/property_get","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var EmberHandlebars = __dependency2__["default"];
+
+    var bind = __dependency3__.bind;
+
+    var get = __dependency4__.get;
+    var isArray = __dependency5__.isArray;
+
+    var helpers = EmberHandlebars.helpers;
+
+    function shouldDisplayIfHelperContent(result) {
+      var truthy = result && get(result, 'isTruthy');
+      if (typeof truthy === 'boolean') { return truthy; }
+
+      if (isArray(result)) {
+        return get(result, 'length') !== 0;
+      } else {
+        return !!result;
+      }
+    }
+
+    /**
+      Use the `boundIf` helper to create a conditional that re-evaluates
+      whenever the truthiness of the bound value changes.
+
+      ```handlebars
+      {{#boundIf "content.shouldDisplayTitle"}}
+        {{content.title}}
+      {{/boundIf}}
+      ```
+
+      @private
+      @method boundIf
+      @for Ember.Handlebars.helpers
+      @param {String} property Property to bind
+      @param {Function} fn Context to provide for rendering
+      @return {String} HTML string
+    */
+    function boundIfHelper(property, fn) {
+      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this;
+
+      fn.helperName = fn.helperName || 'boundIf';
+
+      return bind.call(context, property, fn, true, shouldDisplayIfHelperContent, shouldDisplayIfHelperContent, [
+       'isTruthy',
+       'length'
+     ]);
+    }
+
+    /**
+      @private
+
+      Use the `unboundIf` helper to create a conditional that evaluates once.
+
+      ```handlebars
+      {{#unboundIf "content.shouldDisplayTitle"}}
+        {{content.title}}
+      {{/unboundIf}}
+      ```
+
+      @method unboundIf
+      @for Ember.Handlebars.helpers
+      @param {String} property Property to bind
+      @param {Function} fn Context to provide for rendering
+      @return {String} HTML string
+      @since 1.4.0
+    */
+    function unboundIfHelper(property, fn) {
+      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this;
+      var data = fn.data;
+      var view = data.view;
+      var template = fn.fn;
+      var inverse = fn.inverse;
+
+      var propertyValue = view.getStream(property).value();
+
+      if (!shouldDisplayIfHelperContent(propertyValue)) {
+        template = inverse;
+      }
+
+      template(context, { data: data });
+    }
+
+    /**
+      See [boundIf](/api/classes/Ember.Handlebars.helpers.html#method_boundIf)
+      and [unboundIf](/api/classes/Ember.Handlebars.helpers.html#method_unboundIf)
+
+      @method if
+      @for Ember.Handlebars.helpers
+      @param {Function} context
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function ifHelper(context, options) {
+      Ember.assert("You must pass exactly one argument to the if helper", arguments.length === 2);
+      Ember.assert("You must pass a block to the if helper", options.fn && options.fn !== Handlebars.VM.noop);
+
+      options.helperName = options.helperName || ('if ' + context);
+
+      if (options.data.isUnbound) {
+        return helpers.unboundIf.call(options.contexts[0], context, options);
+      } else {
+        return helpers.boundIf.call(options.contexts[0], context, options);
+      }
+    }
+
+    /**
+      @method unless
+      @for Ember.Handlebars.helpers
+      @param {Function} context
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function unlessHelper(context, options) {
+      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';
+
+      if (context) {
+        helperName += ' ' + context;
+      }
+
+      options.fn = inverse;
+      options.inverse = fn;
+
+      options.helperName = options.helperName || helperName;
+
+      if (options.data.isUnbound) {
+        return helpers.unboundIf.call(options.contexts[0], context, options);
+      } else {
+        return helpers.boundIf.call(options.contexts[0], context, options);
+      }
+    }
+
+    __exports__.ifHelper = ifHelper;
+    __exports__.boundIfHelper = boundIfHelper;
+    __exports__.unboundIfHelper = unboundIfHelper;
+    __exports__.unlessHelper = unlessHelper;
+  });
 enifed("ember-handlebars/helpers/loc",
   ["ember-runtime/system/string","exports"],
   function(__dependency1__, __exports__) {
@@ -9233,16 +8628,15 @@ enifed("ember-handlebars/helpers/loc",
     __exports__["default"] = loc;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/is_none","ember-handlebars/helpers/binding","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert
     // var emberAssert = Ember.assert;
 
-    var isNone = __dependency2__.isNone;
-    var handlebarsGet = __dependency3__.handlebarsGet;
-    var bind = __dependency4__.bind;
+    var isNone = __dependency2__["default"];
+    var bind = __dependency3__.bind;
 
     /**
     @module ember
@@ -9283,16 +8677,6 @@ enifed("ember-handlebars/helpers/partial",
       changes, the partial will be re-rendered using the new template
       name.
 
-      ## Setting the partial's context with `with`
-
-      The `partial` helper can be used in conjunction with the `with`
-      helper to set a context that will be used by the partial:
-
-      ```handlebars
-      {{#with currentUser}}
-        {{partial "user_info"}}
-      {{/with}}
-      ```
 
       @method partial
       @for Ember.Handlebars.helpers
@@ -9300,18 +8684,19 @@ enifed("ember-handlebars/helpers/partial",
     */
 
     __exports__["default"] = function partialHelper(name, options) {
+      var view = options.data.view;
 
       var context = (options.contexts && options.contexts.length) ? options.contexts[0] : this;
 
       options.helperName = options.helperName || 'partial';
 
       if (options.types[0] === "ID") {
+        var partialNameStream = view.getStream(name);
         // Helper was passed a property path; we need to
         // create a binding that will re-render whenever
         // this property changes.
         options.fn = function(context, fnOptions) {
-          var partialName = handlebarsGet(context, name, fnOptions);
-          renderPartial(context, partialName, fnOptions);
+          renderPartial(context, partialNameStream.value(), fnOptions);
         };
 
         return bind.call(context, name, options, true, exists);
@@ -9340,26 +8725,9 @@ enifed("ember-handlebars/helpers/partial",
 
       template = template || deprecatedTemplate;
 
-      template(context, { data: options.data });
-    }
-  });
-enifed("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;
-
-      for (var i=0, l=contexts.length; i<l; i++) {
-        ret.push(handlebarsGet(roots[i], contexts[i], { data: data }));
-      }
-
-      return ret;
+      template(context, {
+        data: options.data
+      });
     }
   });
 enifed("ember-handlebars/helpers/template",
@@ -9370,7 +8738,6 @@ enifed("ember-handlebars/helpers/template",
     // Ember.deprecate;
 
     var EmberHandlebars = __dependency2__["default"];
-    var helpers = EmberHandlebars.helpers;
     /**
     @module ember
     @submodule ember-handlebars
@@ -9383,31 +8750,26 @@ enifed("ember-handlebars/helpers/template",
       @param {String} templateName the template to render
     */
     __exports__["default"] = function templateHelper(name, options) {
-      Ember.deprecate("The `template` helper has been deprecated in favor of the `partial` helper. Please use `partial` instead, which will work the same way.");
+      Ember.deprecate("The `template` helper has been deprecated in favor of the `partial` helper." +
+                      " Please use `partial` instead, which will work the same way.");
 
       options.helperName = options.helperName || 'template';
 
-      return helpers.partial.apply(this, arguments);
+      return EmberHandlebars.helpers.partial.apply(this, arguments);
     }
   });
 enifed("ember-handlebars/helpers/unbound",
-  ["ember-handlebars-compiler","ember-handlebars/helpers/binding","ember-handlebars/ext","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-handlebars-compiler","ember-handlebars/helpers/binding","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    /*globals Handlebars */
-
     /**
     @module ember
     @submodule ember-handlebars
     */
 
     var EmberHandlebars = __dependency1__["default"];
-    var helpers = EmberHandlebars.helpers;
 
     var resolveHelper = __dependency2__.resolveHelper;
-    var handlebarsGet = __dependency3__.handlebarsGet;
-
-    var slice = [].slice;
 
     /**
       `unbound` allows you to output a property without binding. *Important:* The
@@ -9429,31 +8791,39 @@ enifed("ember-handlebars/helpers/unbound",
       @param {String} property
       @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;
+    __exports__["default"] = function unboundHelper(property) {
+      var argsLength = arguments.length;
+      var options = arguments[argsLength - 1];
+      var view = options.data.view;
+      var container = view.container;
 
-      ctx = this;
-      if (arguments.length > 2) {
-        // Unbound helper call.
+      if (argsLength <= 2) {
+        return view.getStream(property).value();
+      } else {
         options.data.isUnbound = true;
-        helper = resolveHelper(container, property) || helpers.helperMissing;
-        out = helper.apply(ctx, slice.call(arguments, 1));
-        delete options.data.isUnbound;
-        return out;
-      }
+        options.types.shift();
 
-      context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : ctx;
-      return handlebarsGet(context, property, fn);
+        var args = new Array(argsLength - 1);
+        for (var i = 1; i < argsLength; i++) {
+          args[i - 1] = arguments[i];
+        }
+
+        var helper = resolveHelper(container, property) || EmberHandlebars.helpers.helperMissing;
+
+        // Attempt to exec the first field as a helper
+        options.name = arguments[0];
+
+        var result = helper.apply(this, args);
+
+        delete options.data.isUnbound;
+        return result;
+      }
     }
   });
 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__) {
+  ["ember-metal/core","ember-runtime/system/object","ember-metal/property_get","ember-metal/keys","ember-metal/mixin","ember-views/streams/read","ember-views/views/view","ember-metal/streams/simple","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
-    /*globals Handlebars */
-
     /**
     @module ember
     @submodule ember-handlebars
@@ -9465,54 +8835,62 @@ enifed("ember-handlebars/helpers/view",
 
     var EmberObject = __dependency2__["default"];
     var get = __dependency3__.get;
-    var set = __dependency4__.set;
+    var keys = __dependency4__["default"];
     var IS_BINDING = __dependency5__.IS_BINDING;
-    var jQuery = __dependency6__["default"];
+    var readViewFactory = __dependency6__.readViewFactory;
     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 SimpleStream = __dependency8__["default"];
 
-
-    var LOWERCASE_A_Z = /^[a-z]/;
-    var VIEW_PREFIX = /^view\./;
-
-    function makeBindings(thisContext, options) {
+    function makeBindings(options) {
       var hash = options.hash;
-      var hashType = options.hashTypes;
+      var hashTypes = options.hashTypes;
+      var view = options.data.view;
 
       for (var prop in hash) {
-        if (hashType[prop] === 'ID') {
+        var hashType = hashTypes[prop];
+        var value = hash[prop];
 
-          var value = hash[prop];
+        if (IS_BINDING.test(prop)) {
+          // classBinding is processed separately
+          if (prop === 'classBinding') {
+            continue;
+          }
 
-          if (IS_BINDING.test(prop)) {
-            Ember.warn("You're attempting to render a view by passing " + prop + "=" + value + " to a view helper, but this syntax is ambiguous. You should either surround " + value + " in quotes or remove `Binding` from " + prop + ".");
-          } else {
-            hash[prop + 'Binding'] = value;
-            hashType[prop + 'Binding'] = 'STRING';
+          if (hashType === 'ID') {
+            Ember.warn("You're attempting to render a view by passing " +
+                       prop + "=" + value +
+                       " to a view helper, but this syntax is ambiguous. You should either surround " +
+                       value + " in quotes or remove `Binding` from " + prop + ".");
+            hash[prop] = view._getBindingForStream(value);
+          } else if (typeof value === 'string') {
+            hash[prop] = view._getBindingForStream(value);
+          }
+        } else {
+          if (hashType === 'ID') {
+            if (prop === 'class') {
+              hash.classBinding = value;
+            } else {
+              hash[prop + 'Binding'] = view._getBindingForStream(value);
+            }
             delete hash[prop];
-            delete hashType[prop];
+            delete hashTypes[prop];
           }
         }
       }
 
-      if (hash.hasOwnProperty('idBinding')) {
+      if (hash.idBinding) {
         // id can't be bound, so just perform one-time lookup.
-        hash.id = handlebarsGet(thisContext, hash.idBinding, options);
-        hashType.id = 'STRING';
+        hash.id = hash.idBinding.value();
+        hashTypes.id = 'STRING';
         delete hash.idBinding;
-        delete hashType.idBinding;
+        delete hashTypes.idBinding;
       }
     }
 
     var ViewHelper = EmberObject.create({
       propertiesFromHTMLOptions: function(options) {
+        var view    = options.data.view;
         var hash    = options.hash;
-        var data    = options.data;
         var classes = hash['class'];
 
         var extensions = {
@@ -9544,101 +8922,55 @@ enifed("ember-handlebars/helpers/view",
         }
 
         if (hash.attributeBindings) {
-          Ember.assert("Setting 'attributeBindings' via Handlebars is not allowed. Please subclass Ember.View and set it there instead.");
+          Ember.assert("Setting 'attributeBindings' via Handlebars is not allowed." +
+                       " Please subclass Ember.View and set it there instead.");
           extensions.attributeBindings = null;
         }
 
         // 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);
+          var prop = hashKeys[i];
 
           if (prop !== 'classNameBindings') {
             extensions[prop] = hash[prop];
           }
-
-          // Test if the property ends in "Binding"
-          if (isBinding && typeof extensions[prop] === 'string') {
-            path = this.contextualizeBindingPath(hash[prop], data);
-            if (path) {
-              extensions[prop] = path;
-            }
-          }
         }
 
-        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];
-
-            if (typeof full === 'string') {
-              // Contextualize the path of classNameBinding so this:
-              //
-              //     classNameBinding="isGreen:green"
-              //
-              // is converted to this:
-              //
-              //     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;
-                }
-              }
+        var classNameBindings = extensions.classNameBindings;
+        if (classNameBindings) {
+          for (var j = 0; j < classNameBindings.length; j++) {
+            var parsedPath = View._parsePropertyPath(classNameBindings[j]);
+            if (parsedPath.path === '') {
+              parsedPath.stream = new SimpleStream(true);
+            } else {
+              parsedPath.stream = view.getStream(parsedPath.path);
             }
+            classNameBindings[j] = parsedPath;
           }
         }
 
         return extensions;
       },
 
-      // Transform bindings from the current context to a context that can be evaluated within the view.
-      // Returns null if the path shouldn't be changed.
-      //
-      // TODO: consider the addition of a prefix that would allow this method to return `path`.
-      contextualizeBindingPath: function(path, data) {
-        var normalized = normalizePath(null, path, data);
-        if (normalized.isKeyword) {
-          return 'templateData.keywords.' + path;
-        } else if (isGlobalPath(path)) {
-          return null;
-        } else if (path === 'this' || path === '') {
-          if (data.insideGroup && data.insideEach) { return 'context'; }
-          return '_parentView.context';
-        } else {
-          return '_parentView.context.' + path;
-        }
-      },
-
-      helper: function(thisContext, path, options) {
+      helper: function(thisContext, newView, options) {
         var data = options.data;
         var fn   = options.fn;
-        var newView;
-        var newViewProto;
 
-        makeBindings(thisContext, options);
-
-        var container = this.container || (data && data.view && data.view.container);
-        newView = handlebarsGetView(thisContext, path, container, options);
-
-        if (View.detectInstance(newView)) {
-          newViewProto = newView;
-        } else {
-          newViewProto = newView.proto();
-        }
+        makeBindings(options);
 
         var viewOptions = this.propertiesFromHTMLOptions(options, thisContext);
         var currentView = data.view;
         viewOptions.templateData = data;
+        var newViewProto = newView.proto();
 
         if (fn) {
-          Ember.assert("You cannot provide a template block if you also specified a templateName", !get(viewOptions, 'templateName') && !get(newViewProto, 'templateName'));
+          Ember.assert("You cannot provide a template block if you also specified a templateName",
+                       !get(viewOptions, 'templateName') && !get(newViewProto, 'templateName'));
           viewOptions.template = fn;
         }
 
@@ -9655,7 +8987,7 @@ enifed("ember-handlebars/helpers/view",
         var data = options.data;
         var fn   = options.fn;
 
-        makeBindings(thisContext, options);
+        makeBindings(options);
 
         Ember.assert(
           'Only a instance of a view may be passed to the ViewHelper.instanceHelper',
@@ -9667,13 +8999,15 @@ enifed("ember-handlebars/helpers/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'));
+          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) {
+        if (!newView.controller && !newView.controllerBinding &&
+            !viewOptions.controller && !viewOptions.controllerBinding) {
           viewOptions._context = thisContext;
         }
 
@@ -9859,27 +9193,199 @@ enifed("ember-handlebars/helpers/view",
       @param {Hash} options
       @return {String} HTML string
     */
-    function viewHelper(path, options) {
+    function viewHelper(path) {
       Ember.assert("The view helper only takes a single argument", arguments.length <= 2);
 
+      var options = arguments[arguments.length - 1];
+      var types = options.types;
+      var view = options.data.view;
+      var container = view.container || view._keywords.view.value().container;
+      var viewClass;
+
       // If no path is provided, treat path param as options
       // 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');
+      if (arguments.length === 1) {
+        if (container) {
+          viewClass = container.lookupFactory('view:toplevel');
         } else {
-          path = View;
+          viewClass = View;
         }
+      } else {
+        var pathStream;
+        if (typeof path === 'string' && types[0] === 'ID') {
+          pathStream = view.getStream(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', !pathStream.isGlobal());
+        } else {
+          pathStream = path;
+        }
+
+        viewClass = readViewFactory(pathStream, container);
       }
 
       options.helperName = options.helperName || 'view';
 
-      return ViewHelper.helper(this, path, options);
+      return ViewHelper.helper(this, viewClass, options);
     }
 
     __exports__.viewHelper = viewHelper;
   });
+enifed("ember-handlebars/helpers/with",
+  ["ember-metal/core","ember-metal/property_set","ember-metal/utils","ember-metal/platform","ember-metal/is_none","ember-handlebars/helpers/binding","ember-handlebars/views/handlebars_bound_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+
+    var set = __dependency2__.set;
+    var apply = __dependency3__.apply;
+    var o_create = __dependency4__.create;
+    var isNone = __dependency5__["default"];
+    var bind = __dependency6__.bind;
+    var _HandlebarsBoundView = __dependency7__._HandlebarsBoundView;
+
+    function exists(value) {
+      return !isNone(value);
+    }
+
+    var WithView = _HandlebarsBoundView.extend({
+      init: function() {
+        apply(this, this._super, arguments);
+
+        var keywordName     = this.templateHash.keywordName;
+        var controllerName  = this.templateHash.controller;
+
+        if (controllerName) {
+          var previousContext = this.previousContext;
+          var controller = this.container.lookupFactory('controller:'+controllerName).create({
+            parentController: previousContext,
+            target: previousContext
+          });
+
+          this._generatedController = controller;
+
+          if (this.preserveContext) {
+            this._keywords[keywordName] = controller;
+            this.lazyValue.subscribe(function(modelStream) {
+              set(controller, 'model', modelStream.value());
+            });
+          } else {
+            set(this, 'controller', controller);
+            this.valueNormalizerFunc = function(result) {
+              controller.set('model', result);
+              return controller;
+            };
+          }
+
+          set(controller, 'model', this.lazyValue.value());
+        }
+      },
+
+      willDestroy: function() {
+        this._super();
+
+        if (this._generatedController) {
+          this._generatedController.destroy();
+        }
+      }
+    });
+
+    /**
+      Use the `{{with}}` helper when you want to aliases the to a new name. It's helpful
+      for semantic clarity and to retain default scope or to reference from another
+      `{{with}}` block.
+
+      ```handlebars
+      // posts might not be
+      {{#with user.posts as blogPosts}}
+        <div class="notice">
+          There are {{blogPosts.length}} blog posts written by {{user.name}}.
+        </div>
+
+        {{#each post in blogPosts}}
+          <li>{{post.title}}</li>
+        {{/each}}
+      {{/with}}
+      ```
+
+      Without the `as` operator, it would be impossible to reference `user.name` in the example above.
+
+      NOTE: The alias should not reuse a name from the bound property path.
+      For example: `{{#with foo.bar as foo}}` is not supported because it attempts to alias using
+      the first part of the property path, `foo`. Instead, use `{{#with foo.bar as baz}}`.
+
+      ### `controller` option
+
+      Adding `controller='something'` instructs the `{{with}}` helper to create and use an instance of
+      the specified controller wrapping the aliased keyword.
+
+      This is very similar to using an `itemController` option with the `{{each}}` helper.
+
+      ```handlebars
+      {{#with users.posts as posts controller='userBlogPosts'}}
+        {{!- `posts` is wrapped in our controller instance }}
+      {{/with}}
+      ```
+
+      In the above example, the `posts` keyword is now wrapped in the `userBlogPost` controller,
+      which provides an elegant way to decorate the context with custom
+      functions/properties.
+
+      @method with
+      @for Ember.Handlebars.helpers
+      @param {Function} context
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    __exports__["default"] = function withHelper(contextPath) {
+      var options = arguments[arguments.length - 1];
+      var view = options.data.view;
+      var bindContext, preserveContext;
+      var helperName = 'with';
+
+      if (arguments.length === 4) {
+        Ember.assert("If you pass more than one argument to the with helper," +
+                     " it must be in the form #with foo as bar", arguments[1] === "as");
+
+        var keywordName = arguments[2];
+
+        if (contextPath) {
+          helperName += ' ' + contextPath + ' as ' + keywordName;
+        }
+
+        Ember.assert("You must pass a block to the with helper", options.fn && options.fn !== Handlebars.VM.noop);
+
+        var localizedOptions = o_create(options);
+        localizedOptions.data = o_create(options.data);
+
+        localizedOptions.keywords = {};
+        localizedOptions.keywords[keywordName] = view.getStream(contextPath);
+
+        localizedOptions.hash.keywordName = keywordName;
+
+        bindContext = this;
+        options = localizedOptions;
+        preserveContext = true;
+      } else {
+        Ember.deprecate('Using the context switching form of `{{with}}` is deprecated. Please use the keyword form (`{{with foo as bar}}`) instead. See http://emberjs.com/guides/deprecations/#toc_more-consistent-handlebars-scope for more details.');
+
+        Ember.assert("You must pass exactly one argument to the with helper", arguments.length === 2);
+        Ember.assert("You must pass a block to the with helper", options.fn && options.fn !== Handlebars.VM.noop);
+
+        helperName += ' ' + contextPath;
+        bindContext = options.contexts[0];
+        preserveContext = false;
+      }
+
+      options.helperName = helperName;
+
+      return bind.call(bindContext, contextPath, options, preserveContext, exists, undefined, undefined, WithView);
+    }
+  });
 enifed("ember-handlebars/helpers/yield",
   ["ember-metal/core","ember-metal/property_get","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
@@ -10112,7 +9618,7 @@ enifed("ember-handlebars/string",
       @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
     */
     function htmlSafe(str) {
-      if (str === undefined || str === null) {
+      if (str === null || str === undefined) {
         return "";
       }
 
@@ -10146,10 +9652,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__) {
+  ["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-handlebars/string","ember-views/views/states","ember-handlebars/views/metamorph_view","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
-    /*globals Handlebars, Metamorph:true */
     /*jshint newcap:false*/
 
 
@@ -10160,7 +9665,6 @@ enifed("ember-handlebars/views/handlebars_bound_view",
 
     var EmberHandlebars = __dependency1__["default"];
     // EmberHandlebars.SafeString;
-    var SafeString = EmberHandlebars.SafeString;
 
     var Ember = __dependency2__["default"];
     // Ember.K
@@ -10171,21 +9675,16 @@ enifed("ember-handlebars/views/handlebars_bound_view",
     var set = __dependency5__.set;
     var merge = __dependency6__["default"];
     var run = __dependency7__["default"];
-    var View = __dependency8__["default"];
-    var htmlSafe = __dependency9__["default"];
-    var cloneStates = __dependency10__.cloneStates;
-    var states = __dependency10__.states;
-    var viewStates = states;
+    var htmlSafe = __dependency8__["default"];
+    var cloneStates = __dependency9__.cloneStates;
+    var viewStates = __dependency9__.states;
 
-    var _MetamorphView = __dependency11__["default"];
-    var handlebarsGet = __dependency12__.handlebarsGet;
-    var uuid = __dependency13__.uuid;
+    var _MetamorphView = __dependency10__["default"];
+    var uuid = __dependency11__.uuid;
 
-    function SimpleHandlebarsView(path, pathRoot, isEscaped, templateData) {
-      this.path = path;
-      this.pathRoot = pathRoot;
+    function SimpleHandlebarsView(lazyValue, isEscaped) {
+      this.lazyValue = lazyValue;
       this.isEscaped = isEscaped;
-      this.templateData = templateData;
       this[Ember.GUID_KEY] = uuid();
       this._lastNormalizedValue = undefined;
       this.state = 'preRender';
@@ -10216,23 +9715,11 @@ enifed("ember-handlebars/views/handlebars_bound_view",
       propertyDidChange: K,
 
       normalizedValue: function() {
-        var path = this.path;
-        var pathRoot = this.pathRoot;
-        var escape = this.isEscaped;
-        var result, templateData;
+        var result = this.lazyValue.value();
 
-        // Use the pathRoot as the result if no path is provided. This
-        // happens if the path is `this`, which gets normalized into
-        // a `pathRoot` of the current Handlebars context and a path
-        // of `''`.
-        if (path === '') {
-          result = pathRoot;
-        } else {
-          templateData = this.templateData;
-          result = handlebarsGet(pathRoot, path, { data: templateData });
-        }
-
-        if (!escape && !(result instanceof SafeString)) {
+        if (result === null || result === undefined) {
+          result = "";
+        } else if (!this.isEscaped && !(result instanceof EmberHandlebars.SafeString)) {
           result = htmlSafe(result);
         }
 
@@ -10263,7 +9750,7 @@ enifed("ember-handlebars/views/handlebars_bound_view",
       update: function () {
         this.updateId = null;
         var value = this.normalizedValue();
-        // doesn't diff SafeString instances
+        // doesn't diff EmberHandlebars.SafeString instances
         if (value !== this._lastNormalizedValue) {
           this._lastNormalizedValue = value;
           this._morph.update(value);
@@ -10275,7 +9762,7 @@ enifed("ember-handlebars/views/handlebars_bound_view",
       }
     };
 
-    states = cloneStates(viewStates);
+    var states = cloneStates(viewStates);
 
     merge(states._default, {
       rerenderIfNeeded: K
@@ -10363,49 +9850,12 @@ enifed("ember-handlebars/views/handlebars_bound_view",
       */
       inverseTemplate: null,
 
-
-      /**
-        The path to look up on `pathRoot` that is passed to
-        `shouldDisplayFunc` to determine which template to render.
-
-        In addition, if `preserveContext` is `false,` the object at this path will
-        be passed to the template when rendering.
-
-        @property path
-        @type String
-        @default null
-      */
-      path: null,
-
-      /**
-        The object from which the `path` will be looked up. Sometimes this is the
-        same as the `previousContext`, but in cases where this view has been
-        generated for paths that start with a keyword such as `view` or
-        `controller`, the path root will be that resolved object.
-
-        @property pathRoot
-        @type Object
-      */
-      pathRoot: null,
+      lazyValue: null,
 
       normalizedValue: function() {
-        var path = get(this, 'path');
-        var pathRoot  = get(this, 'pathRoot');
+        var value = this.lazyValue.value();
         var valueNormalizer = get(this, 'valueNormalizerFunc');
-        var result, templateData;
-
-        // Use the pathRoot as the result if no path is provided. This
-        // happens if the path is `this`, which gets normalized into
-        // a `pathRoot` of the current Handlebars context and a path
-        // of `''`.
-        if (path === '') {
-          result = pathRoot;
-        } else {
-          templateData = get(this, 'templateData');
-          result = handlebarsGet(pathRoot, path, { data: templateData });
-        }
-
-        return valueNormalizer ? valueNormalizer(result) : result;
+        return valueNormalizer ? valueNormalizer(value) : value;
       },
 
       rerenderIfNeeded: function() {
@@ -10464,7 +9914,7 @@ enifed("ember-handlebars/views/handlebars_bound_view",
             // expression to the render context and return.
               if (result === null || result === undefined) {
                 result = "";
-              } else if (!(result instanceof SafeString)) {
+              } else if (!(result instanceof EmberHandlebars.SafeString)) {
                 result = String(result);
               }
 
@@ -10493,11 +9943,9 @@ enifed("ember-handlebars/views/handlebars_bound_view",
     __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__) {
+  ["ember-metal/core","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
-    /* global Metamorph:true */
-
     /*jshint newcap:false*/
     var Ember = __dependency1__["default"];
     // Ember.deprecate
@@ -10505,17 +9953,12 @@ enifed("ember-handlebars/views/metamorph_view",
     var CoreView = __dependency2__["default"];
     var View = __dependency3__["default"];
     var Mixin = __dependency4__.Mixin;
-    var run = __dependency5__["default"];
 
     /**
     @module ember
     @submodule ember-handlebars
     */
 
-    function notifyMutationListeners() {
-      run.once(View, 'notifyMutationListeners');
-    }
-
     // The `morph` and `outerHTML` properties are internal only
     // and not observable.
 
@@ -10532,7 +9975,8 @@ enifed("ember-handlebars/views/metamorph_view",
 
       init: function() {
         this._super();
-        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);
+        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);
       }
     });
     __exports__._Metamorph = _Metamorph;
@@ -10543,8 +9987,8 @@ enifed("ember-handlebars/views/metamorph_view",
       @uses Ember._Metamorph
       @private
     */
-    var _MetamorphView = View.extend(_Metamorph);
-    __exports__._MetamorphView = _MetamorphView;
+    __exports__["default"] = View.extend(_Metamorph);
+
     /**
       @class _SimpleMetamorphView
       @namespace Ember
@@ -10553,7 +9997,7 @@ enifed("ember-handlebars/views/metamorph_view",
       @private
     */
     var _SimpleMetamorphView = CoreView.extend(_Metamorph);
-    __exports__._SimpleMetamorphView = _SimpleMetamorphView;__exports__["default"] = View.extend(_Metamorph);
+    __exports__._SimpleMetamorphView = _SimpleMetamorphView;
   });
 enifed("ember-metal-views",
   ["ember-metal-views/renderer","exports"],
@@ -10604,7 +10048,7 @@ enifed("ember-metal-views/renderer",
       var level = 0;
 
       var view = _view;
-      var children, i, l, child;
+      var children, i, child;
       while (length) {
         elements[level] = element;
         if (!view._morph) {
@@ -10678,7 +10122,7 @@ enifed("ember-metal-views/renderer",
 
       this.insertElement(view, _parentView, element, insertAt);
 
-      for (i=total-1;i>=0;i--) {
+      for (i=total-1; i>=0; i--) {
         if (willInsert) {
           views[i]._elementInserted = true;
           this.didInsertElement(views[i]);
@@ -10705,7 +10149,7 @@ enifed("ember-metal-views/renderer",
         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] = this.scheduleRender(this, function scheduledRenderTree() {
           this._inserts[viewId] = null;
           this.renderTree(view);
         });
@@ -10738,8 +10182,7 @@ enifed("ember-metal-views/renderer",
       var removeQueue = [];
       var destroyQueue = [];
       var morph = _view._morph;
-      var  idx, len, view, staticChildren, queue,
-        childViews, i, l, parentView;
+      var idx, len, view, queue, childViews, i, l;
 
       removeQueue.push(_view);
 
@@ -10869,30 +10312,30 @@ enifed("ember-metal",
     var Ember = __dependency1__["default"];
     var merge = __dependency2__["default"];
     var instrument = __dependency3__.instrument;
+    var reset = __dependency3__.reset;
     var subscribe = __dependency3__.subscribe;
     var unsubscribe = __dependency3__.unsubscribe;
-    var reset = __dependency3__.reset;
-    var generateGuid = __dependency4__.generateGuid;
-    var GUID_KEY = __dependency4__.GUID_KEY;
-    var guidFor = __dependency4__.guidFor;
-    var META_DESC = __dependency4__.META_DESC;
     var EMPTY_META = __dependency4__.EMPTY_META;
-    var meta = __dependency4__.meta;
-    var getMeta = __dependency4__.getMeta;
-    var setMeta = __dependency4__.setMeta;
-    var metaPath = __dependency4__.metaPath;
-    var inspect = __dependency4__.inspect;
-    var typeOf = __dependency4__.typeOf;
-    var tryCatchFinally = __dependency4__.tryCatchFinally;
-    var isArray = __dependency4__.isArray;
-    var makeArray = __dependency4__.makeArray;
-    var canInvoke = __dependency4__.canInvoke;
-    var tryInvoke = __dependency4__.tryInvoke;
-    var tryFinally = __dependency4__.tryFinally;
-    var wrap = __dependency4__.wrap;
+    var GUID_KEY = __dependency4__.GUID_KEY;
+    var META_DESC = __dependency4__.META_DESC;
     var apply = __dependency4__.apply;
     var applyStr = __dependency4__.applyStr;
+    var canInvoke = __dependency4__.canInvoke;
+    var generateGuid = __dependency4__.generateGuid;
+    var getMeta = __dependency4__.getMeta;
+    var guidFor = __dependency4__.guidFor;
+    var inspect = __dependency4__.inspect;
+    var isArray = __dependency4__.isArray;
+    var makeArray = __dependency4__.makeArray;
+    var meta = __dependency4__.meta;
+    var metaPath = __dependency4__.metaPath;
+    var setMeta = __dependency4__.setMeta;
+    var tryCatchFinally = __dependency4__.tryCatchFinally;
+    var tryFinally = __dependency4__.tryFinally;
+    var tryInvoke = __dependency4__.tryInvoke;
+    var typeOf = __dependency4__.typeOf;
     var uuid = __dependency4__.uuid;
+    var wrap = __dependency4__.wrap;
     var EmberError = __dependency5__["default"];
     var EnumerableUtils = __dependency6__["default"];
     var Cache = __dependency7__["default"];
@@ -10904,55 +10347,55 @@ enifed("ember-metal",
     var map = __dependency9__.map;
     var Logger = __dependency10__["default"];
 
+    var _getPath = __dependency11__._getPath;
     var get = __dependency11__.get;
     var getWithDefault = __dependency11__.getWithDefault;
     var normalizeTuple = __dependency11__.normalizeTuple;
-    var _getPath = __dependency11__._getPath;
 
-    var on = __dependency12__.on;
     var addListener = __dependency12__.addListener;
+    var hasListeners = __dependency12__.hasListeners;
+    var listenersDiff = __dependency12__.listenersDiff;
+    var listenersFor = __dependency12__.listenersFor;
+    var listenersUnion = __dependency12__.listenersUnion;
+    var on = __dependency12__.on;
     var removeListener = __dependency12__.removeListener;
+    var sendEvent = __dependency12__.sendEvent;
     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 ObserverSet = __dependency13__["default"];
 
-    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 endPropertyChanges = __dependency14__.endPropertyChanges;
+    var overrideChains = __dependency14__.overrideChains;
+    var propertyDidChange = __dependency14__.propertyDidChange;
+    var propertyWillChange = __dependency14__.propertyWillChange;
 
     var Descriptor = __dependency15__.Descriptor;
     var defineProperty = __dependency15__.defineProperty;
     var set = __dependency16__.set;
     var trySet = __dependency16__.trySet;
 
-    var OrderedSet = __dependency17__.OrderedSet;
     var Map = __dependency17__.Map;
     var MapWithDefault = __dependency17__.MapWithDefault;
+    var OrderedSet = __dependency17__.OrderedSet;
     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 flushPendingChains = __dependency21__.flushPendingChains;
+    var removeChainWatcher = __dependency21__.removeChainWatcher;
     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 isWatching = __dependency23__.isWatching;
+    var rewatch = __dependency23__.rewatch;
+    var unwatch = __dependency23__.unwatch;
+    var watch = __dependency23__.watch;
     var expandProperties = __dependency24__["default"];
     var ComputedProperty = __dependency25__.ComputedProperty;
     var computed = __dependency25__.computed;
@@ -10960,34 +10403,32 @@ enifed("ember-metal",
 
     // 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 _suspendObserver = __dependency27__._suspendObserver;
     var _suspendObservers = __dependency27__._suspendObservers;
+    var addBeforeObserver = __dependency27__.addBeforeObserver;
+    var addObserver = __dependency27__.addObserver;
     var beforeObserversFor = __dependency27__.beforeObserversFor;
+    var observersFor = __dependency27__.observersFor;
     var removeBeforeObserver = __dependency27__.removeBeforeObserver;
+    var removeObserver = __dependency27__.removeObserver;
     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 immediateObserver = __dependency28__.immediateObserver;
+    var mixin = __dependency28__.mixin;
+    var observer = __dependency28__.observer;
+    var required = __dependency28__.required;
     var Binding = __dependency29__.Binding;
-    var isGlobalPath = __dependency29__.isGlobalPath;
     var bind = __dependency29__.bind;
+    var isGlobalPath = __dependency29__.isGlobalPath;
     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 isNone = __dependency32__["default"];
+    var isEmpty = __dependency33__["default"];
     var isBlank = __dependency34__["default"];
     var isPresent = __dependency35__["default"];
     var keys = __dependency36__["default"];
@@ -11140,11 +10581,7 @@ enifed("ember-metal",
     Ember.libraries.registerCoreLibrary('Ember', Ember.VERSION);
 
     Ember.isNone = isNone;
-    Ember.none = none;
-
     Ember.isEmpty = isEmpty;
-    Ember.empty = empty;
-
     Ember.isBlank = isBlank;
 
     
@@ -11185,26 +10622,28 @@ enifed("ember-metal",
     __exports__["default"] = Ember;
   });
 enifed("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__) {
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/core","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__, __dependency9__, __exports__) {
     "use strict";
     var get = __dependency1__.get;
     var set = __dependency2__.set;
-    var EmberError = __dependency3__["default"];
-    var Descriptor = __dependency4__.Descriptor;
-    var defineProperty = __dependency4__.defineProperty;
-    var ComputedProperty = __dependency5__.ComputedProperty;
-    var create = __dependency6__.create;
-    var meta = __dependency7__.meta;
-    var inspect = __dependency7__.inspect;
-    var addDependentKeys = __dependency8__.addDependentKeys;
-    var removeDependentKeys = __dependency8__.removeDependentKeys;
+    var Ember = __dependency3__["default"];
+    // Ember.assert
+    var EmberError = __dependency4__["default"];
+    var Descriptor = __dependency5__.Descriptor;
+    var defineProperty = __dependency5__.defineProperty;
+    var ComputedProperty = __dependency6__.ComputedProperty;
+    var create = __dependency7__.create;
+    var meta = __dependency8__.meta;
+    var inspect = __dependency8__.inspect;
+    var addDependentKeys = __dependency9__.addDependentKeys;
+    var removeDependentKeys = __dependency9__.removeDependentKeys;
 
-    function alias(altKey) {
+    __exports__["default"] = function alias(altKey) {
       return new AliasedProperty(altKey);
     }
 
-    __exports__.alias = alias;function AliasedProperty(altKey) {
+    function AliasedProperty(altKey) {
       this.altKey = altKey;
       this._dependentKeys = [ altKey ];
     }
@@ -11228,6 +10667,7 @@ enifed("ember-metal/alias",
     };
 
     AliasedProperty.prototype.setup = function(obj, keyName) {
+      Ember.assert("Setting alias '" + keyName + "' on self", this.altKey !== keyName);
       var m = meta(obj);
       if (m.watching[keyName]) {
         addDependentKeys(this, obj, keyName, m);
@@ -11402,7 +10842,6 @@ enifed("ember-metal/binding",
     var Ember = __dependency1__["default"];
     // Ember.Logger, Ember.LOG_BINDINGS, assert
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
     var trySet = __dependency3__.trySet;
     var guidFor = __dependency4__.guidFor;
     var addObserver = __dependency5__.addObserver;
@@ -11565,7 +11004,9 @@ enifed("ember-metal/binding",
         addObserver(obj, fromPath, this, this.fromDidChange);
 
         // if the binding is a two-way binding, also set up an observer on the target
-        if (!this._oneWay) { addObserver(obj, toPath, this, this.toDidChange); }
+        if (!this._oneWay) {
+          addObserver(obj, toPath, this, this.toDidChange);
+        }
 
         this._readyToSync = true;
 
@@ -11590,7 +11031,9 @@ enifed("ember-metal/binding",
         removeObserver(obj, this._from, this, this.fromDidChange);
 
         // if the binding is two-way, remove the observer from the target as well
-        if (twoWay) { removeObserver(obj, this._to, this, this.toDidChange); }
+        if (twoWay) {
+          removeObserver(obj, this._to, this, this.toDidChange);
+        }
 
         this._readyToSync = false; // disable scheduled syncs...
         return this;
@@ -11904,10 +11347,7 @@ enifed("ember-metal/cache",
       this.func   = func;
     }
 
-    var FALSE     = function() { };
-    var ZERO      = function() { };
     var UNDEFINED = function() { };
-    var NULL      = function() { };
 
     Cache.prototype = {
       set: function(key, value) {
@@ -11956,12 +11396,11 @@ enifed("ember-metal/chains",
     // warn, assert, etc;
     var get = __dependency2__.get;
     var normalizeTuple = __dependency2__.normalizeTuple;
-    var meta = __dependency3__.meta;
+    var metaFor = __dependency3__.meta;
     var forEach = __dependency4__.forEach;
     var watchKey = __dependency5__.watchKey;
     var unwatchKey = __dependency5__.unwatchKey;
 
-    var metaFor = meta;
     var warn = Ember.warn;
     var FIRST_KEY = /^([^\.]+)/;
 
@@ -11980,9 +11419,12 @@ enifed("ember-metal/chains",
       var queue = pendingQueue;
       pendingQueue = [];
 
-      forEach.call(queue, function(q) { q[0].add(q[1]); });
+      forEach.call(queue, function(q) {
+        q[0].add(q[1]);
+      });
 
-      warn('Watching an undefined global, Ember expects watched globals to be setup by the time the run loop is flushed, check for typos', pendingQueue.length === 0);
+      warn('Watching an undefined global, Ember expects watched globals to be' +
+           ' setup by the time the run loop is flushed, check for typos', pendingQueue.length === 0);
     }
 
     __exports__.flushPendingChains = flushPendingChains;function addChainWatcher(obj, keyName, node) {
@@ -11995,7 +11437,9 @@ enifed("ember-metal/chains",
         nodes = m.chainWatchers = {};
       }
 
-      if (!nodes[keyName]) { nodes[keyName] = []; }
+      if (!nodes[keyName]) {
+        nodes[keyName] = [];
+      }
       nodes[keyName].push(node);
       watchKey(obj, keyName, m);
     }
@@ -12039,7 +11483,9 @@ enifed("ember-metal/chains",
       this._paths = {};
       if (this._watching) {
         this._object = parent.value();
-        if (this._object) { addChainWatcher(this._object, this._key, this); }
+        if (this._object) {
+          addChainWatcher(this._object, this._key, this);
+        }
       }
 
       // Special-case: the EachProxy relies on immediate evaluation to
@@ -12059,9 +11505,13 @@ enifed("ember-metal/chains",
 
       var meta = obj['__ember_meta__'];
       // check if object meant only to be a prototype
-      if (meta && meta.proto === obj) return undefined;
+      if (meta && meta.proto === obj) {
+        return undefined;
+      }
 
-      if (key === "@each") return get(obj, key);
+      if (key === "@each") {
+        return get(obj, key);
+      }
 
       // if a CP only return cached value
       var desc = meta && meta.descs[key];
@@ -12087,7 +11537,9 @@ enifed("ember-metal/chains",
     ChainNodePrototype.destroy = function() {
       if (this._watching) {
         var obj = this._object;
-        if (obj) { removeChainWatcher(obj, this._key, this); }
+        if (obj) {
+          removeChainWatcher(obj, this._key, this);
+        }
         this._watching = false; // so future calls do nothing
       }
     };
@@ -12099,7 +11551,10 @@ enifed("ember-metal/chains",
       var path;
 
       for (path in paths) {
-        if (paths[path] <= 0) { continue; } // this check will also catch non-number vals.
+        // this check will also catch non-number vals.
+        if (paths[path] <= 0) {
+          continue;
+        }
         ret.add(path);
       }
       return ret;
@@ -12146,7 +11601,9 @@ enifed("ember-metal/chains",
       var obj, tuple, key, src, paths;
 
       paths = this._paths;
-      if (paths[path] > 0) { paths[path]--; }
+      if (paths[path] > 0) {
+        paths[path]--;
+      }
 
       obj = this.value();
       tuple = normalizeTuple(obj, path);
@@ -12169,10 +11626,14 @@ enifed("ember-metal/chains",
     ChainNodePrototype.chain = function(key, path, src) {
       var chains = this._chains;
       var node;
-      if (!chains) { chains = this._chains = {}; }
+      if (!chains) {
+        chains = this._chains = {};
+      }
 
       node = chains[key];
-      if (!node) { node = chains[key] = new ChainNode(this, key, src); }
+      if (!node) {
+        node = chains[key] = new ChainNode(this, key, src);
+      }
       node.count++; // count chains...
 
       // chain rest of path if there is one
@@ -12188,10 +11649,10 @@ enifed("ember-metal/chains",
       var node = chains[key];
 
       // unchain rest of path first...
-      if (path && path.length>1) {
-        key  = firstKey(path);
-        path = path.slice(key.length+1);
-        node.unchain(key, path);
+      if (path && path.length > 1) {
+        var nextKey  = firstKey(path);
+        var nextPath = path.slice(nextKey.length + 1);
+        node.unchain(nextKey, nextPath);
       }
 
       // delete node if needed.
@@ -12207,16 +11668,22 @@ enifed("ember-metal/chains",
       var chains = this._chains;
       if (chains) {
         for(var key in chains) {
-          if (!chains.hasOwnProperty(key)) { continue; }
+          if (!chains.hasOwnProperty(key)) {
+            continue;
+          }
           chains[key].willChange(events);
         }
       }
 
-      if (this._parent) { this._parent.chainWillChange(this, this._key, 1, events); }
+      if (this._parent) {
+        this._parent.chainWillChange(this, this._key, 1, events);
+      }
     };
 
     ChainNodePrototype.chainWillChange = function(chain, path, depth, events) {
-      if (this._key) { path = this._key + '.' + path; }
+      if (this._key) {
+        path = this._key + '.' + path;
+      }
 
       if (this._parent) {
         this._parent.chainWillChange(this, path, depth+1, events);
@@ -12232,7 +11699,10 @@ enifed("ember-metal/chains",
     };
 
     ChainNodePrototype.chainDidChange = function(chain, path, depth, events) {
-      if (this._key) { path = this._key + '.' + path; }
+      if (this._key) {
+        path = this._key + '.' + path;
+      }
+
       if (this._parent) {
         this._parent.chainDidChange(this, path, depth+1, events);
       } else {
@@ -12259,8 +11729,9 @@ enifed("ember-metal/chains",
 
         // Special-case: the EachProxy relies on immediate evaluation to
         // establish its observers.
-        if (this._parent && this._parent._key === '@each')
+        if (this._parent && this._parent._key === '@each') {
           this.value();
+        }
       }
 
       // then notify chains...
@@ -12273,22 +11744,30 @@ enifed("ember-metal/chains",
       }
 
       // if no events are passed in then we only care about the above wiring update
-      if (events === null) { return; }
+      if (events === null) {
+        return;
+      }
 
       // and finally tell parent about my path changing...
-      if (this._parent) { this._parent.chainDidChange(this, this._key, 1, events); }
+      if (this._parent) {
+        this._parent.chainDidChange(this, this._key, 1, events);
+      }
     };
 
     function finishChains(obj) {
       // We only create meta if we really have to
-      var m = obj['__ember_meta__'],
-        chains, chainWatchers, chainNodes;
+      var m = obj['__ember_meta__'];
+      var 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; }
+            if (!chainWatchers.hasOwnProperty(key)) {
+              continue;
+            }
+
             chainNodes = chainWatchers[key];
             if (chainNodes) {
               for (var i=0,l=chainNodes.length;i<l;i++) {
@@ -12309,29 +11788,27 @@ enifed("ember-metal/chains",
     __exports__.ChainNode = ChainNode;
   });
 enifed("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__) {
+  ["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__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var meta = __dependency4__.meta;
-    var inspect = __dependency4__.inspect;
-    var expandProperties = __dependency5__["default"];
-    var EmberError = __dependency6__["default"];
-    var Descriptor = __dependency7__.Descriptor;
-    var defineProperty = __dependency7__.defineProperty;
-    var propertyWillChange = __dependency8__.propertyWillChange;
-    var propertyDidChange = __dependency8__.propertyDidChange;
-    var addDependentKeys = __dependency9__.addDependentKeys;
-    var removeDependentKeys = __dependency9__.removeDependentKeys;
+    var set = __dependency1__.set;
+    var meta = __dependency2__.meta;
+    var inspect = __dependency2__.inspect;
+    var expandProperties = __dependency3__["default"];
+    var EmberError = __dependency4__["default"];
+    var Descriptor = __dependency5__.Descriptor;
+    var defineProperty = __dependency5__.defineProperty;
+    var propertyWillChange = __dependency6__.propertyWillChange;
+    var propertyDidChange = __dependency6__.propertyDidChange;
+    var addDependentKeys = __dependency7__.addDependentKeys;
+    var removeDependentKeys = __dependency7__.removeDependentKeys;
 
     /**
     @module ember-metal
     */
 
-    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);
-
+    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;
@@ -12343,18 +11820,18 @@ enifed("ember-metal/computed",
     //
 
     /**
-      A computed property transforms an objects function into a property.
+      A computed property transforms an object's function into a property.
 
       By default the function backing the computed property will only be called
       once and the result will be cached. You can specify various properties
-      that your computed property is dependent on. This will force the cached
+      that your computed property depends on. This will force the cached
       result to be recomputed if the dependencies are modified.
 
       In the following example we declare a computed property (by calling
-      `.property()` on the fullName function) and setup the properties
+      `.property()` on the fullName function) and setup the property
       dependencies (depending on firstName and lastName). The fullName function
       will be called once (regardless of how many times it is accessed) as long
-      as it's dependencies have not been changed. Once firstName or lastName are updated
+      as its dependencies have not changed. Once firstName or lastName are updated
       any future calls (or anything bound) to fullName will incorporate the new
       values.
 
@@ -12427,6 +11904,10 @@ enifed("ember-metal/computed",
       func.__ember_arity__ = func.length;
       this.func = func;
 
+      this._dependentKeys = undefined;
+      this._suspended = undefined;
+      this._meta = undefined;
+
       this._cacheable = (opts && opts.cacheable !== undefined) ? opts.cacheable : true;
       this._dependentKeys = opts && opts.dependentKeys;
       this._readOnly = opts && (opts.readOnly !== undefined || !!opts.readOnly) || false;
@@ -12435,9 +11916,6 @@ enifed("ember-metal/computed",
     ComputedProperty.prototype = new Descriptor();
 
     var ComputedPropertyPrototype = ComputedProperty.prototype;
-    ComputedPropertyPrototype._dependentKeys = undefined;
-    ComputedPropertyPrototype._suspended = undefined;
-    ComputedPropertyPrototype._meta = undefined;
 
     /**
       Properties are cacheable by default. Computed property will automatically
@@ -12649,7 +12127,9 @@ enifed("ember-metal/computed",
         }
 
         chainNodes = meta.chainWatchers && meta.chainWatchers[keyName];
-        if (chainNodes) { finishChains(chainNodes); }
+        if (chainNodes) {
+          finishChains(chainNodes);
+        }
         addDependentKeys(this, obj, keyName, meta);
       } else {
         ret = this.func.call(obj, keyName);
@@ -12891,7 +12371,9 @@ enifed("ember-metal/computed",
       var cache = meta && meta.cache;
       var ret = cache && cache[key];
 
-      if (ret === UNDEFINED) { return undefined; }
+      if (ret === UNDEFINED) {
+        return undefined;
+      }
       return ret;
     }
 
@@ -12905,7 +12387,9 @@ enifed("ember-metal/computed",
 
     cacheFor.get = function(cache, key) {
       var ret = cache[key];
-      if (ret === UNDEFINED) { return undefined; }
+      if (ret === UNDEFINED) {
+        return undefined;
+      }
       return ret;
     };
 
@@ -12926,8 +12410,8 @@ enifed("ember-metal/computed_macros",
     var set = __dependency3__.set;
     var computed = __dependency4__.computed;
     var isEmpty = __dependency5__["default"];
-    var isNone = __dependency6__.isNone;
-    var alias = __dependency7__.alias;
+    var isNone = __dependency6__["default"];
+    var alias = __dependency7__["default"];
 
     /**
     @module ember-metal
@@ -13431,7 +12915,7 @@ enifed("ember-metal/computed_macros",
       values of all passed in properties to an array.
     */
     registerComputedWithProperties('collect', function(properties) {
-      var res = [];
+      var res = Ember.A();
       for (var key in properties) {
         if (properties.hasOwnProperty(key)) {
           if (isNone(properties[key])) {
@@ -13626,7 +13110,7 @@ enifed("ember-metal/core",
   ["exports"],
   function(__exports__) {
     "use strict";
-    /*globals Ember:true,Em:true,ENV,EmberENV,MetamorphENV:true */
+    /*globals Ember:true,ENV,EmberENV,MetamorphENV:true */
 
     /**
     @module ember
@@ -13650,7 +13134,7 @@ enifed("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.8.1
+      @version 1.9.0
     */
 
     if ('undefined' === typeof Ember) {
@@ -13660,9 +13144,9 @@ enifed("ember-metal/core",
     }
 
     // Default imports, exports and lookup to the global object;
-    var imports = Ember.imports = Ember.imports || this;
-    var exports = Ember.exports = Ember.exports || this;
-    var lookup  = Ember.lookup  = Ember.lookup  || this;
+    Ember.imports = Ember.imports || this;
+    Ember.lookup  = Ember.lookup  || this;
+    var exports   = Ember.exports = Ember.exports || this;
 
     // aliases needed to keep minifiers from removing the global context
     exports.Em = exports.Ember = Ember;
@@ -13677,10 +13161,10 @@ enifed("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.8.1'
+      @default '1.9.0'
       @static
     */
-    Ember.VERSION = '1.8.1';
+    Ember.VERSION = '1.9.0';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -13795,7 +13279,7 @@ enifed("ember-metal/core",
     Ember.LOG_STACKTRACE_ON_DEPRECATION = (Ember.ENV.LOG_STACKTRACE_ON_DEPRECATION !== false);
 
     /**
-      Determines whether Ember should add ECMAScript 5 shims to older browsers.
+      Determines whether Ember should add ECMAScript 5 Array shims to older browsers.
 
       @property SHIM_ES5
       @type Boolean
@@ -13819,10 +13303,10 @@ enifed("ember-metal/core",
       @private
       @return {Object}
     */
-    var K = function() { return this; };
-    var K = K;
-    __exports__.K = K;Ember.K = K;
-    //TODO: ES6 GLOBL TODO
+    function K() { return this; }
+    __exports__.K = K;
+    Ember.K = K;
+    //TODO: ES6 GLOBAL TODO
 
     // Stub out the methods defined by the ember-debug package in case it's not loaded
 
@@ -14287,14 +13771,13 @@ enifed("ember-metal/events",
     @module ember-metal
     */
     var Ember = __dependency1__["default"];
-    var meta = __dependency2__.meta;
+    var metaFor = __dependency2__.meta;
     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;
@@ -14335,21 +13818,26 @@ enifed("ember-metal/events",
     function actionsFor(obj, eventName) {
       var meta = metaFor(obj, true);
       var actions;
+      var listeners = meta.listeners;
 
-      if (!meta.listeners) { meta.listeners = {}; }
-
-      if (!meta.hasOwnProperty('listeners')) {
+      if (!listeners) {
+        listeners = meta.listeners = create(null);
+        listeners.__source__ = obj;
+      } else if (listeners.__source__ !== obj) {
         // setup inherited copy of the listeners object
-        meta.listeners = create(meta.listeners);
+        listeners = meta.listeners = create(listeners);
+        listeners.__source__ = obj;
       }
 
-      actions = meta.listeners[eventName];
+      actions = listeners[eventName];
 
       // if there are actions, but the eventName doesn't exist in our listeners, then copy them from the prototype
-      if (actions && !meta.listeners.hasOwnProperty(eventName)) {
-        actions = meta.listeners[eventName] = meta.listeners[eventName].slice();
+      if (actions && actions.__source__ !== obj) {
+        actions = listeners[eventName] = listeners[eventName].slice();
+        actions.__source__ = obj;
       } else if (!actions) {
-        actions = meta.listeners[eventName] = [];
+        actions = listeners[eventName] = [];
+        actions.__source__ = obj;
       }
 
       return actions;
@@ -14400,7 +13888,7 @@ enifed("ember-metal/events",
       @for Ember
       @param obj
       @param {String} eventName
-      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Object|Function} target A target object or a function
       @param {Function|String} method A function or the name of a function to be called on `target`
       @param {Boolean} once A flag whether a function should only be called once
     */
@@ -14436,7 +13924,7 @@ enifed("ember-metal/events",
       @for Ember
       @param obj
       @param {String} eventName
-      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Object|Function} target A target object or a function
       @param {Function|String} method A function or the name of a function to be called on `target`
     */
     function removeListener(obj, eventName, target, method) {
@@ -14488,7 +13976,7 @@ enifed("ember-metal/events",
       @private
       @param obj
       @param {String} eventName
-      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Object|Function} target A target object or a function
       @param {Function|String} method A function or the name of a function to be called on `target`
       @param {Function} callback
     */
@@ -14519,8 +14007,8 @@ enifed("ember-metal/events",
 
       @private
       @param obj
-      @param {Array} eventName Array of event names
-      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Array} eventNames Array of event names
+      @param {Object|Function} target A target object or a function
       @param {Function|String} method A function or the name of a function to be called on `target`
       @param {Function} callback
     */
@@ -14570,8 +14058,11 @@ enifed("ember-metal/events",
       var listeners = obj['__ember_meta__'].listeners, ret = [];
 
       if (listeners) {
-        for(var eventName in listeners) {
-          if (listeners[eventName]) { ret.push(eventName); }
+        for (var eventName in listeners) {
+          if (eventName !== '__source__' &&
+              listeners[eventName]) {
+            ret.push(eventName);
+          }
         }
       }
       return ret;
@@ -14838,6 +14329,59 @@ enifed("ember-metal/get_properties",
       return ret;
     }
   });
+enifed("ember-metal/injected_property",
+  ["ember-metal/core","ember-metal/computed","ember-metal/properties","ember-metal/platform","ember-metal/utils","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var ComputedProperty = __dependency2__.ComputedProperty;
+    var Descriptor = __dependency3__.Descriptor;
+    var create = __dependency4__.create;
+    var inspect = __dependency5__.inspect;
+    var EmberError = __dependency6__["default"];
+
+    /**
+      Read-only property that returns the result of a container lookup.
+
+      @class InjectedProperty
+      @namespace Ember
+      @extends Ember.Descriptor
+      @constructor
+      @param {String} type The container type the property will lookup
+      @param {String} name (optional) The name the property will lookup, defaults
+             to the property's name
+    */
+    function InjectedProperty(type, name) {
+      this.type = type;
+      this.name = name;
+
+      this._super$Constructor(function(keyName) {
+        Ember.assert("Attempting to lookup an injected property on an object " +
+                     "without a container, ensure that the object was " +
+                     "instantiated via a container.", this.container);
+
+        return this.container.lookup(type + ':' + (name || keyName));
+      }, { readOnly: true });
+    }
+
+    InjectedProperty.prototype = create(Descriptor.prototype);
+
+    var InjectedPropertyPrototype = InjectedProperty.prototype;
+    var ComputedPropertyPrototype = ComputedProperty.prototype;
+
+    InjectedPropertyPrototype._super$Constructor = ComputedProperty;
+
+    InjectedPropertyPrototype.get = ComputedPropertyPrototype.get;
+
+    InjectedPropertyPrototype.set = function(obj, keyName) {
+      throw new EmberError("Cannot set injected property '" + keyName + "' on object: " + inspect(obj));
+    };
+
+    InjectedPropertyPrototype.teardown = ComputedPropertyPrototype.teardown;
+
+    __exports__["default"] = InjectedProperty;
+  });
 enifed("ember-metal/instrumentation",
   ["ember-metal/core","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
@@ -15065,12 +14609,10 @@ enifed("ember-metal/instrumentation",
     __exports__.reset = reset;
   });
 enifed("ember-metal/is_blank",
-  ["ember-metal/core","ember-metal/is_empty","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+  ["ember-metal/is_empty","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    // deprecateFunc
-    var isEmpty = __dependency2__["default"];
+    var isEmpty = __dependency1__["default"];
 
     /**
       A value is blank if it is empty or a whitespace string.
@@ -15100,13 +14642,11 @@ enifed("ember-metal/is_blank",
     }
   });
 enifed("ember-metal/is_empty",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/is_none","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/property_get","ember-metal/is_none","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    // deprecateFunc
-    var get = __dependency2__.get;
-    var isNone = __dependency3__["default"];
+    var get = __dependency1__.get;
+    var isNone = __dependency2__["default"];
 
     /**
       Verifies that a value is `null` or an empty string, empty array,
@@ -15121,6 +14661,7 @@ enifed("ember-metal/is_empty",
       Ember.isEmpty(undefined);       // true
       Ember.isEmpty('');              // true
       Ember.isEmpty([]);              // true
+      Ember.isEmpty({});              // false
       Ember.isEmpty('Adam Hawkins');  // false
       Ember.isEmpty([0,1,2]);         // false
       ```
@@ -15163,19 +14704,12 @@ enifed("ember-metal/is_empty",
       return false;
     }
 
-    var empty = Ember.deprecateFunc("Ember.empty is deprecated. Please use Ember.isEmpty instead.", isEmpty);
-    __exports__.empty = empty;
     __exports__["default"] = isEmpty;
-    __exports__.isEmpty = isEmpty;
-    __exports__.empty = empty;
   });
 enifed("ember-metal/is_none",
-  ["ember-metal/core","exports"],
-  function(__dependency1__, __exports__) {
+  ["exports"],
+  function(__exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    // deprecateFunc
-
     /**
       Returns true if the passed value is null or undefined. This avoids errors
       from JSLint complaining about use of ==, which can be technically
@@ -15199,10 +14733,7 @@ enifed("ember-metal/is_none",
       return obj === null || obj === undefined;
     }
 
-    var none = Ember.deprecateFunc("Ember.none is deprecated. Please use Ember.isNone instead.", isNone);
-    __exports__.none = none;
     __exports__["default"] = isNone;
-    __exports__.isNone = isNone;
   });
 enifed("ember-metal/is_present",
   ["ember-metal/is_blank","exports"],
@@ -15282,7 +14813,8 @@ enifed("ember-metal/keys",
             throw new TypeError('Object.keys called on non-object');
           }
 
-          var result = [], prop, i;
+          var result = [];
+          var prop, i;
 
           for (prop in obj) {
             if (prop !== '_super' &&
@@ -15372,8 +14904,12 @@ enifed("ember-metal/logger",
       var method = typeof consoleObj === 'object' ? consoleObj[name] : null;
 
       if (method) {
-        // Older IE doesn't support apply, but Chrome needs it
-        if (typeof method.apply === 'function') {
+        // Older IE doesn't support bind, but Chrome needs it
+        if (typeof method.bind === 'function') {
+          logToConsole = method.bind(consoleObj);
+          logToConsole.displayName = 'console.' + name;
+          return logToConsole;
+        } else if (typeof method.apply === 'function') {
           logToConsole = function() {
             method.apply(consoleObj, arguments);
           };
@@ -15887,7 +15423,8 @@ enifed("ember-metal/map",
 
       /**
         Iterate over all the keys and values. Calls the function once
-        for each key, passing in the key and value, in that order.
+        for each key, passing in value, key, and the map being iterated over,
+        in that order.
 
         The keys are guaranteed to be iterated over in insertion order.
 
@@ -15910,11 +15447,11 @@ enifed("ember-metal/map",
         if (length === 2) {
           thisArg = arguments[1];
           cb = function(key) {
-            callback.call(thisArg, map.get(key), key);
+            callback.call(thisArg, map.get(key), key, map);
           };
         } else {
           cb = function(key) {
-            callback(map.get(key), key);
+            callback(map.get(key), key, map);
           };
         }
 
@@ -16051,8 +15588,8 @@ enifed("ember-metal/merge",
     }
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/merge","ember-metal/array","ember-metal/platform","ember-metal/property_get","ember-metal/property_set","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__, __dependency12__, __dependency13__, __exports__) {
         // Remove "use strict"; from transpiled module until
     // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
     //
@@ -16066,35 +15603,33 @@ enifed("ember-metal/mixin",
     var Ember = __dependency1__["default"];
     // warn, assert, wrap, et;
     var merge = __dependency2__["default"];
-    var map = __dependency3__.map;
-    var indexOf = __dependency3__.indexOf;
-    var forEach = __dependency3__.forEach;
-    var create = __dependency4__.create;
-    var guidFor = __dependency5__.guidFor;
-    var meta = __dependency5__.meta;
-    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;
-    var ComputedProperty = __dependency8__.ComputedProperty;
-    var Binding = __dependency9__.Binding;
-    var addObserver = __dependency10__.addObserver;
-    var removeObserver = __dependency10__.removeObserver;
-    var addBeforeObserver = __dependency10__.addBeforeObserver;
-    var removeBeforeObserver = __dependency10__.removeBeforeObserver;
-    var addListener = __dependency11__.addListener;
-    var removeListener = __dependency11__.removeListener;
+    var a_indexOf = __dependency3__.indexOf;
+    var a_forEach = __dependency3__.forEach;
+    var o_create = __dependency4__.create;
+    var get = __dependency5__.get;
+    var set = __dependency6__.set;
+    var trySet = __dependency6__.trySet;
+    var guidFor = __dependency7__.guidFor;
+    var metaFor = __dependency7__.meta;
+    var wrap = __dependency7__.wrap;
+    var makeArray = __dependency7__.makeArray;
+    var apply = __dependency7__.apply;
+    var isArray = __dependency7__.isArray;
+    var expandProperties = __dependency8__["default"];
+    var Descriptor = __dependency9__.Descriptor;
+    var defineProperty = __dependency9__.defineProperty;
+    var ComputedProperty = __dependency10__.ComputedProperty;
+    var Binding = __dependency11__.Binding;
+    var addObserver = __dependency12__.addObserver;
+    var removeObserver = __dependency12__.removeObserver;
+    var addBeforeObserver = __dependency12__.addBeforeObserver;
+    var removeBeforeObserver = __dependency12__.removeBeforeObserver;
+    var _suspendObserver = __dependency12__._suspendObserver;
+    var addListener = __dependency13__.addListener;
+    var removeListener = __dependency13__.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;
 
     function superFunction(){
       var func = this.__nextSuper;
@@ -16122,26 +15657,15 @@ enifed("ember-metal/mixin",
       return ret;
     }
 
-    function initMixin(mixin, args) {
-      if (args && args.length > 0) {
-        mixin.mixins = a_map.call(args, function(x) {
-          if (x instanceof Mixin) { return x; }
-
-          // Note: Manually setup a primitive mixin here. This is the only
-          // way to actually get a primitive mixin. This way normal creation
-          // of mixins will give you combined mixins...
-          var mixin = new Mixin();
-          mixin.properties = x;
-          return mixin;
-        });
-      }
-      return mixin;
-    }
-
     function isMethod(obj) {
       return 'function' === typeof obj &&
              obj.isMethod !== false &&
-             obj !== Boolean && obj !== Object && obj !== Number && obj !== Array && obj !== Date && obj !== String;
+             obj !== Boolean &&
+             obj !== Object &&
+             obj !== Number &&
+             obj !== Array &&
+             obj !== Date &&
+             obj !== String;
     }
 
     var CONTINUE = {};
@@ -16197,6 +15721,10 @@ enifed("ember-metal/mixin",
       return property;
     }
 
+    var sourceAvailable = (function() {
+      return this;
+    }).toString().indexOf('return this;') > -1;
+
     function giveMethodSuper(obj, key, method, values, descs) {
       var superMethod;
 
@@ -16215,7 +15743,21 @@ enifed("ember-metal/mixin",
         return method;
       }
 
-      return wrap(method, superMethod);
+      var hasSuper;
+      if (sourceAvailable) {
+        hasSuper = method.__hasSuper;
+
+        if (hasSuper === undefined) {
+          hasSuper = method.toString().indexOf('_super') > -1;
+          method.__hasSuper = hasSuper;
+        }
+      }
+
+      if (sourceAvailable === false || hasSuper) {
+        return wrap(method, superMethod);
+      } else {
+        return method;
+      }
     }
 
     function applyConcatenatedProperties(obj, key, value, values) {
@@ -16223,7 +15765,11 @@ enifed("ember-metal/mixin",
 
       if (baseValue) {
         if ('function' === typeof baseValue.concat) {
-          return baseValue.concat(value);
+          if (value === null || value === undefined) {
+            return baseValue;
+          } else {
+            return baseValue.concat(value);
+          }
         } else {
           return makeArray(baseValue).concat(value);
         }
@@ -16342,6 +15888,31 @@ enifed("ember-metal/mixin",
       }
     }
 
+    function connectStreamBinding(obj, key, stream) {
+      var onNotify = function(stream) {
+        _suspendObserver(obj, key, null, didChange, function() {
+          trySet(obj, key, stream.value());
+        });
+      };
+
+      var didChange = function() {
+        stream.setValue(get(obj, key), onNotify);
+      };
+
+      // Initialize value
+      set(obj, key, stream.value());
+
+      addObserver(obj, key, null, didChange);
+
+      stream.subscribe(onNotify);
+
+      if (obj._streamBindingSubscriptions === undefined) {
+        obj._streamBindingSubscriptions = o_create(null);
+      }
+
+      obj._streamBindingSubscriptions[key] = onNotify;
+    }
+
     function connectBindings(obj, m) {
       // TODO Mixin.apply(instance) should disconnect binding if exists
       var bindings = m.bindings;
@@ -16351,7 +15922,10 @@ enifed("ember-metal/mixin",
           binding = bindings[key];
           if (binding) {
             to = key.slice(0, -7); // strip Binding off end
-            if (binding instanceof Binding) {
+            if (binding.isStream) {
+              connectStreamBinding(obj, to, binding);
+              continue;
+            } else if (binding instanceof Binding) {
               binding = binding.copy(); // copy prototypes' instance
               binding.to(to);
             } else { // binding is string path
@@ -16529,12 +16103,29 @@ enifed("ember-metal/mixin",
       @namespace Ember
     */
     __exports__["default"] = Mixin;
-    function Mixin() { return initMixin(this, arguments); }
-    Mixin.prototype = {
-      properties: null,
-      mixins: null,
-      ownerConstructor: null
-    };
+    function Mixin(args, properties) {
+      this.properties = properties;
+
+      var length = args && args.length;
+
+      if (length > 0) {
+        var m = new Array(length);
+
+        for (var i = 0; i < length; i++) {
+          var x = args[i];
+          if (x instanceof Mixin) {
+            m[i] = x;
+          } else {
+            m[i] = new Mixin(undefined, x);
+          }
+        }
+
+        this.mixins = m;
+      } else {
+        this.mixins = undefined;
+      }
+      this.ownerConstructor = undefined;
+    }
 
     Mixin._apply = applyMixin;
 
@@ -16557,7 +16148,12 @@ enifed("ember-metal/mixin",
       // ES6TODO: this relies on a global state?
       Ember.anyUnprocessedMixins = true;
       var M = this;
-      return initMixin(new M(), arguments);
+      var length = arguments.length;
+      var args = new Array(length);
+      for (var i = 0; i < length; i++) {
+        args[i] = arguments[i];
+      }
+      return new M(args, undefined);
     };
 
     var MixinPrototype = Mixin.prototype;
@@ -16567,12 +16163,11 @@ enifed("ember-metal/mixin",
       @param arguments*
     */
     MixinPrototype.reopen = function() {
-      var mixin, tmp;
+      var mixin;
 
       if (this.properties) {
-        mixin = Mixin.create();
-        mixin.properties = this.properties;
-        delete this.properties;
+        mixin = new Mixin(undefined, this.properties);
+        this.properties = undefined;
         this.mixins = [mixin];
       } else if (!this.mixins) {
         this.mixins = [];
@@ -16585,14 +16180,13 @@ enifed("ember-metal/mixin",
       for(idx=0; idx < len; idx++) {
         mixin = arguments[idx];
         Ember.assert('Expected hash or Mixin instance, got ' + Object.prototype.toString.call(mixin),
-                     typeof mixin === 'object' && mixin !== null && Object.prototype.toString.call(mixin) !== '[object Array]');
+                     typeof mixin === 'object' && mixin !== null &&
+                       Object.prototype.toString.call(mixin) !== '[object Array]');
 
         if (mixin instanceof Mixin) {
           mixins.push(mixin);
         } else {
-          tmp = Mixin.create();
-          tmp.properties = mixin;
-          mixins.push(tmp);
+          mixins.push(new Mixin(undefined, mixin));
         }
       }
 
@@ -16644,7 +16238,7 @@ enifed("ember-metal/mixin",
     };
 
     MixinPrototype.without = function() {
-      var ret = new Mixin(this);
+      var ret = new Mixin([this]);
       ret._without = a_slice.call(arguments);
       return ret;
     };
@@ -16669,7 +16263,9 @@ enifed("ember-metal/mixin",
       var ret = [];
       _keys(keys, this, seen);
       for(var key in keys) {
-        if (keys.hasOwnProperty(key)) { ret.push(key); }
+        if (keys.hasOwnProperty(key)) {
+          ret.push(key);
+        }
       }
       return ret;
     };
@@ -16819,7 +16415,8 @@ enifed("ember-metal/mixin",
     function immediateObserver() {
       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.", typeof arg !== "string" || arg.indexOf('.') === -1);
+        Ember.assert("Immediate observers must observe internal properties only, not properties on other objects.",
+                     typeof arg !== "string" || arg.indexOf('.') === -1);
       }
 
       return observer.apply(this, arguments);
@@ -16950,12 +16547,12 @@ enifed("ember-metal/observer",
       @for Ember
       @param obj
       @param {String} path
-      @param {Object|Function} targetOrMethod
+      @param {Object|Function} target
       @param {Function|String} [method]
     */
-    function removeObserver(obj, _path, target, method) {
-      unwatch(obj, _path);
-      removeListener(obj, changeEvent(_path), target, method);
+    function removeObserver(obj, path, target, method) {
+      unwatch(obj, path);
+      removeListener(obj, changeEvent(path), target, method);
 
       return this;
     }
@@ -16965,12 +16562,12 @@ enifed("ember-metal/observer",
       @for Ember
       @param obj
       @param {String} path
-      @param {Object|Function} targetOrMethod
+      @param {Object|Function} target
       @param {Function|String} [method]
     */
-    function addBeforeObserver(obj, _path, target, method) {
-      addListener(obj, beforeEvent(_path), target, method);
-      watch(obj, _path);
+    function addBeforeObserver(obj, path, target, method) {
+      addListener(obj, beforeEvent(path), target, method);
+      watch(obj, path);
 
       return this;
     }
@@ -17006,12 +16603,12 @@ enifed("ember-metal/observer",
       @for Ember
       @param obj
       @param {String} path
-      @param {Object|Function} targetOrMethod
+      @param {Object|Function} target
       @param {Function|String} [method]
     */
-    function removeBeforeObserver(obj, _path, target, method) {
-      unwatch(obj, _path);
-      removeListener(obj, beforeEvent(_path), target, method);
+    function removeBeforeObserver(obj, path, target, method) {
+      unwatch(obj, path);
+      removeListener(obj, beforeEvent(path), target, method);
 
       return this;
     }
@@ -17099,16 +16696,34 @@ enifed("ember-metal/path_cache",
     var IS_GLOBAL_PATH = /^([A-Z$]|([0-9][A-Z$])).*[\.]/;
     var HAS_THIS       = 'this.';
 
-    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 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 firstDotIndexCache  = new Cache(1000, function(key) { return key.indexOf('.');             });
+
+    var firstKeyCache = new Cache(1000, function(path) {
+      var index = firstDotIndexCache.get(path);
+      if (index === -1) {
+        return path;
+      } else {
+        return path.slice(0, index);
+      }
+    });
+
+    var tailPathCache = new Cache(1000, function(path) {
+      var index = firstDotIndexCache.get(path);
+      if (index !== -1) {
+        return path.slice(index + 1);
+      }
+    });
 
     var caches = {
-      isGlobalCache:     isGlobalCache,
-      isGlobalPathCache: isGlobalPathCache,
-      hasThisCache:      hasThisCache,
-      isPathCache:       isPathCache
+      isGlobalCache:      isGlobalCache,
+      isGlobalPathCache:  isGlobalPathCache,
+      hasThisCache:       hasThisCache,
+      firstDotIndexCache: firstDotIndexCache,
+      firstKeyCache:      firstKeyCache,
+      tailPathCache:      tailPathCache
     };
     __exports__.caches = caches;
     function isGlobal(path) {
@@ -17124,10 +16739,18 @@ enifed("ember-metal/path_cache",
     }
 
     __exports__.hasThis = hasThis;function isPath(path) {
-      return isPathCache.get(path);
+      return firstDotIndexCache.get(path) !== -1;
     }
 
-    __exports__.isPath = isPath;
+    __exports__.isPath = isPath;function getFirstKey(path) {
+      return firstKeyCache.get(path);
+    }
+
+    __exports__.getFirstKey = getFirstKey;function getTailPath(path) {
+      return tailPathCache.get(path);
+    }
+
+    __exports__.getTailPath = getTailPath;
   });
 enifed("ember-metal/platform",
   ["ember-metal/platform/define_property","ember-metal/platform/define_properties","ember-metal/platform/create","exports"],
@@ -17557,6 +17180,7 @@ enifed("ember-metal/properties",
 
       return this;
     }
+
     __exports__.defineProperty = defineProperty;
   });
 enifed("ember-metal/property_events",
@@ -17599,9 +17223,18 @@ enifed("ember-metal/property_events",
       var proto = m && m.proto;
       var desc = m && m.descs[keyName];
 
-      if (!watching) { return; }
-      if (proto === obj) { return; }
-      if (desc && desc.willChange) { desc.willChange(obj, keyName); }
+      if (!watching) {
+        return;
+      }
+
+      if (proto === obj) {
+        return;
+      }
+
+      if (desc && desc.willChange) {
+        desc.willChange(obj, keyName);
+      }
+
       dependentKeysWillChange(obj, keyName, m);
       chainsWillChange(obj, keyName, m);
       notifyBeforeObservers(obj, keyName);
@@ -17628,11 +17261,18 @@ enifed("ember-metal/property_events",
       var proto = m && m.proto;
       var desc = m && m.descs[keyName];
 
-      if (proto === obj) { return; }
+      if (proto === obj) {
+        return;
+      }
 
       // shouldn't this mean that we're watching this key?
-      if (desc && desc.didChange) { desc.didChange(obj, keyName); }
-      if (!watching && keyName !== 'length') { return; }
+      if (desc && desc.didChange) {
+        desc.didChange(obj, keyName);
+      }
+
+      if (!watching && keyName !== 'length') {
+        return;
+      }
 
       if (m && m.deps && m.deps[keyName]) {
         dependentKeysDidChange(obj, keyName, m);
@@ -17651,9 +17291,16 @@ enifed("ember-metal/property_events",
       if (meta && meta.deps && (deps = meta.deps[depKey])) {
         var seen = WILL_SEEN;
         var top = !seen;
-        if (top) { seen = WILL_SEEN = {}; }
+
+        if (top) {
+          seen = WILL_SEEN = {};
+        }
+
         iterDeps(propertyWillChange, obj, deps, depKey, seen, meta);
-        if (top) { WILL_SEEN = null; }
+
+        if (top) {
+          WILL_SEEN = null;
+        }
       }
     }
 
@@ -17665,15 +17312,26 @@ enifed("ember-metal/property_events",
       if (meta && meta.deps && (deps = meta.deps[depKey])) {
         var seen = DID_SEEN;
         var top = !seen;
-        if (top) { seen = DID_SEEN = {}; }
+
+        if (top) {
+          seen = DID_SEEN = {};
+        }
+
         iterDeps(propertyDidChange, obj, deps, depKey, seen, meta);
-        if (top) { DID_SEEN = null; }
+
+        if (top) {
+          DID_SEEN = null;
+        }
       }
     }
 
     function keysOf(obj) {
       var keys = [];
-      for (var key in obj) keys.push(key);
+
+      for (var key in obj) {
+        keys.push(key);
+      }
+
       return keys;
     }
 
@@ -17681,8 +17339,15 @@ enifed("ember-metal/property_events",
       var keys, key, i, desc;
       var guid = guidFor(obj);
       var current = seen[guid];
-      if (!current) current = seen[guid] = {};
-      if (current[depKey]) return;
+
+      if (!current) {
+        current = seen[guid] = {};
+      }
+
+      if (current[depKey]) {
+        return;
+      }
+
       current[depKey] = true;
 
       if (deps) {
@@ -17691,7 +17356,11 @@ enifed("ember-metal/property_events",
         for (i=0; i<keys.length; i++) {
           key = keys[i];
           desc = descs[key];
-          if (desc && desc._suspended === obj) continue;
+
+          if (desc && desc._suspended === obj) {
+            continue;
+          }
+
           method(obj, key);
         }
       }
@@ -18190,7 +17859,6 @@ enifed("ember-metal/run_loop",
       onErrorMethod: 'onerror'
     });
     var slice = [].slice;
-    var concat = [].concat;
 
     // ..........................................................
     // run - this is ideally the only public API the dev sees
@@ -18265,45 +17933,45 @@ enifed("ember-metal/run_loop",
       @return {Object} Return value from invoking the passed function. Please note,
       when called within an existing loop, no return value is possible.
     */
-    run.join = function(target, method /* args */) {
-      if (!run.currentRunLoop) {
-        return Ember.run.apply(Ember, arguments);
-      }
-
-      var args = slice.call(arguments);
-      args.unshift('actions');
-      run.schedule.apply(run, args);
+    run.join = function() {
+      return backburner.join.apply(backburner, arguments);
     };
 
     /**
-      Provides a useful utility for when integrating with non-Ember libraries
-      that provide asynchronous callbacks.
+      Allows you to specify which context to call the specified function in while
+      adding the execution of that function to the Ember run loop. This ability
+      makes this method a great way to asynchronusly integrate third-party libraries
+      into your Ember application.
 
-      Ember utilizes a run-loop to batch and coalesce changes. This works by
-      marking the start and end of Ember-related Javascript execution.
+      `run.bind` takes two main arguments, the desired context and the function to
+      invoke in that context. Any additional arguments will be supplied as arguments
+      to the function that is passed in.
 
-      When using events such as a View's click handler, Ember wraps the event
-      handler in a run-loop, but when integrating with non-Ember libraries this
-      can be tedious.
-
-      For example, the following is rather verbose but is the correct way to combine
-      third-party events and Ember code.
+      Let's use the creation of a TinyMCE component as an example. Currently,
+      TinyMCE provides a setup configuration option we can use to do some processing
+      after the TinyMCE instance is initialized but before it is actually rendered.
+      We can use that setup option to do some additional setup for our component.
+      The component itself could look something like the following:
 
       ```javascript
-      var that = this;
-      jQuery(window).on('resize', function(){
-        run(function(){
-          that.handleResize();
-        });
+      App.RichTextEditorComponent = Ember.Component.extend({
+        initializeTinyMCE: function(){
+          tinymce.init({
+            selector: '#' + this.$().prop('id'),
+            setup: Ember.run.bind(this, this.setupEditor)
+          });
+        }.on('didInsertElement'),
+
+        setupEditor: function(editor) {
+          this.set('editor', editor);
+          editor.on('change', function(){ console.log('content changed!')} );
+        }
       });
       ```
 
-      To reduce the boilerplate, the following can be used to construct a
-      run-loop-wrapped callback handler.
-
-      ```javascript
-      jQuery(window).on('resize', run.bind(this, this.handleResize));
-      ```
+      In this example, we use Ember.run.bind to bind the setupEditor message to the
+      context of the App.RichTextEditorComponent and to have the invocation of that
+      method be safely handled and excuted by the Ember run loop.
 
       @method bind
       @namespace Ember
@@ -18316,7 +17984,7 @@ enifed("ember-metal/run_loop",
       when called within an existing loop, no return value is possible.
       @since 1.4.0
     */
-    run.bind = function(target, method /* args*/) {
+    run.bind = function(target, method /* args */) {
       var args = slice.call(arguments);
       return function() {
         return run.join.apply(run, args.concat(slice.call(arguments)));
@@ -18489,10 +18157,14 @@ 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.once = function(target, method) {
+    run.once = function(/*target, method */) {
       checkAutoRun();
-      var args = slice.call(arguments);
-      args.unshift('actions');
+      var length = arguments.length;
+      var args = new Array(length);
+      args[0] = 'actions';
+      for (var i = 0; i < length; i++) {
+        args[i + 1] = arguments[i];
+      }
       return apply(backburner, backburner.scheduleOnce, args);
     };
 
@@ -18766,7 +18438,8 @@ enifed("ember-metal/run_loop",
     // Make sure it's not an autorun during testing
     function checkAutoRun() {
       if (!run.currentRunLoop) {
-        Ember.assert("You have turned on testing mode, which disabled the run-loop's autorun. You will need to wrap any code with asynchronous side-effects in an run", !Ember.testing);
+        Ember.assert("You have turned on testing mode, which disabled the run-loop's autorun." +
+                     " You will need to wrap any code with asynchronous side-effects in an run", !Ember.testing);
       }
     }
 
@@ -18829,6 +18502,316 @@ enifed("ember-metal/set_properties",
       return obj;
     }
   });
+enifed("ember-metal/streams/read",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    function read(object) {
+      if (object && object.isStream) {
+        return object.value();
+      } else {
+        return object;
+      }
+    }
+
+    __exports__.read = read;function readArray(array) {
+      var length = array.length;
+      var ret = new Array(length);
+      for (var i = 0; i < length; i++) {
+        ret[i] = read(array[i]);
+      }
+      return ret;
+    }
+
+    __exports__.readArray = readArray;function readHash(object) {
+      var ret = {};
+      for (var key in object) {
+        ret[key] = read(object[key]);
+      }
+      return ret;
+    }
+
+    __exports__.readHash = readHash;
+  });
+enifed("ember-metal/streams/simple",
+  ["ember-metal/merge","ember-metal/streams/stream","ember-metal/platform","ember-metal/streams/read","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var merge = __dependency1__["default"];
+    var Stream = __dependency2__["default"];
+    var create = __dependency3__.create;
+    var read = __dependency4__.read;
+
+    function SimpleStream(source) {
+      this.source = source;
+
+      if (source && source.isStream) {
+        source.subscribe(this._didChange, this);
+      }
+    }
+
+    SimpleStream.prototype = create(Stream.prototype);
+
+    merge(SimpleStream.prototype, {
+      valueFn: function() {
+        return read(this.source);
+      },
+
+      setValue: function(value) {
+        var source = this.source;
+
+        if (source && source.isStream) {
+          source.setValue(value);
+        }
+      },
+
+      setSource: function(nextSource) {
+        var prevSource = this.source;
+        if (nextSource !== prevSource) {
+          if (prevSource && prevSource.isStream) {
+            prevSource.unsubscribe(this._didChange, this);
+          }
+
+          if (nextSource && nextSource.isStream) {
+            nextSource.subscribe(this._didChange, this);
+          }
+
+          this.source = nextSource;
+          this.notify();
+        }
+      },
+
+      _didChange: function() {
+        this.notify();
+      },
+
+      destroy: function() {
+        if (this.source && this.source.isStream) {
+          this.source.unsubscribe(this._didChange, this);
+        }
+
+        this.source = undefined;
+        Stream.prototype.destroy.call(this);
+      }
+    });
+
+    __exports__["default"] = SimpleStream;
+  });
+enifed("ember-metal/streams/stream",
+  ["ember-metal/platform","ember-metal/path_cache","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var create = __dependency1__.create;
+    var getFirstKey = __dependency2__.getFirstKey;
+    var getTailPath = __dependency2__.getTailPath;
+
+    var NIL = function NIL(){};
+
+    function Stream(fn) {
+      this.valueFn = fn;
+      this.cache = NIL;
+      this.subscribers = undefined;
+      this.children = undefined;
+      this.destroyed = false;
+    }
+
+    Stream.prototype = {
+      isStream: true,
+
+      cache: NIL,
+
+      get: function(path) {
+        var firstKey = getFirstKey(path);
+        var tailPath = getTailPath(path);
+
+        if (this.children === undefined) {
+          this.children = create(null);
+        }
+
+        var keyStream = this.children[firstKey];
+
+        if (keyStream === undefined) {
+          keyStream = this._makeChildStream(firstKey, path);
+          this.children[firstKey] = keyStream;
+        }
+
+        if (tailPath === undefined) {
+          return keyStream;
+        } else {
+          return keyStream.get(tailPath);
+        }
+      },
+
+      value: function() {
+        if (this.cache !== NIL) {
+          return this.cache;
+        } else {
+          return this.cache = this.valueFn();
+        }
+      },
+
+      setValue: function() {
+        throw new Error("Stream error: setValue not implemented");
+      },
+
+      notify: function() {
+        this.notifyExcept();
+      },
+
+      notifyExcept: function(callbackToSkip, contextToSkip) {
+        if (this.cache !== NIL) {
+          this.cache = NIL;
+          this.notifySubscribers(callbackToSkip, contextToSkip);
+        }
+      },
+
+      subscribe: function(callback, context) {
+        if (this.subscribers === undefined) {
+          this.subscribers = [callback, context];
+        } else {
+          this.subscribers.push(callback, context);
+        }
+      },
+
+      unsubscribe: function(callback, context) {
+        var subscribers = this.subscribers;
+
+        if (subscribers !== undefined) {
+          for (var i = 0, l = subscribers.length; i < l; i += 2) {
+            if (subscribers[i] === callback && subscribers[i+1] === context) {
+              subscribers.splice(i, 2);
+              return;
+            }
+          }
+        }
+      },
+
+      notifySubscribers: function(callbackToSkip, contextToSkip) {
+        var subscribers = this.subscribers;
+
+        if (subscribers !== undefined) {
+          for (var i = 0, l = subscribers.length; i < l; i += 2) {
+            var callback = subscribers[i];
+            var context = subscribers[i+1];
+
+            if (callback === callbackToSkip && context === contextToSkip) {
+              continue;
+            }
+
+            if (context === undefined) {
+              callback(this);
+            } else {
+              callback.call(context, this);
+            }
+          }
+        }
+      },
+
+      destroy: function() {
+        if (this.destroyed) return;
+        this.destroyed = true;
+
+        var children = this.children;
+        for (var key in children) {
+          children[key].destroy();
+        }
+      },
+
+      isGlobal: function() {
+        var stream = this;
+        while (stream !== undefined) {
+          if (stream._isRoot) {
+            return stream._isGlobal;
+          }
+          stream = stream.source;
+        }
+      }
+    };
+
+    __exports__["default"] = Stream;
+  });
+enifed("ember-metal/streams/stream_binding",
+  ["ember-metal/platform","ember-metal/merge","ember-metal/run_loop","ember-metal/streams/stream","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var create = __dependency1__.create;
+    var merge = __dependency2__["default"];
+    var run = __dependency3__["default"];
+    var Stream = __dependency4__["default"];
+
+    function StreamBinding(stream) {
+      Ember.assert("StreamBinding error: tried to bind to object that is not a stream", stream && stream.isStream);
+
+      this.stream = stream;
+      this.senderCallback = undefined;
+      this.senderContext = undefined;
+      this.senderValue = undefined;
+      this.destroyed = false;
+
+      stream.subscribe(this._onNotify, this);
+    }
+
+    StreamBinding.prototype = create(Stream.prototype);
+
+    merge(StreamBinding.prototype, {
+      valueFn: function() {
+        return this.stream.value();
+      },
+
+      _onNotify: function() {
+        this._scheduleSync(undefined, undefined, this);
+      },
+
+      setValue: function(value, callback, context) {
+        this._scheduleSync(value, callback, context);
+      },
+
+      _scheduleSync: function(value, callback, context) {
+        if (this.senderCallback === undefined && this.senderContext === undefined) {
+          this.senderCallback = callback;
+          this.senderContext = context;
+          this.senderValue = value;
+          run.schedule('sync', this, this._sync);
+        } else if (this.senderContext !== this) {
+          this.senderCallback = callback;
+          this.senderContext = context;
+          this.senderValue = value;
+        }
+      },
+
+      _sync: function() {
+        if (this.destroyed) {
+          return;
+        }
+
+        if (this.senderContext !== this) {
+          this.stream.setValue(this.senderValue);
+        }
+
+        var senderCallback = this.senderCallback;
+        var senderContext = this.senderContext;
+        this.senderCallback = undefined;
+        this.senderContext = undefined;
+        this.senderValue = undefined;
+
+        // Force StreamBindings to always notify
+        this.cache = undefined;
+
+        this.notifyExcept(senderCallback, senderContext);
+      },
+
+      destroy: function() {
+        if (this.destroyed) {
+          return;
+        }
+
+        this.destroyed = true;
+        this.stream.unsubscribe(this._onNotify, this);
+      }
+    });
+
+    __exports__["default"] = StreamBinding;
+  });
 enifed("ember-metal/utils",
   ["ember-metal/core","ember-metal/platform","ember-metal/array","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
@@ -18841,7 +18824,7 @@ enifed("ember-metal/utils",
     var o_defineProperty = __dependency2__.defineProperty;
     var canDefineNonEnumerableProperties = __dependency2__.canDefineNonEnumerableProperties;
     var hasPropertyAccessors = __dependency2__.hasPropertyAccessors;
-    var create = __dependency2__.create;
+    var o_create = __dependency2__.create;
 
     var forEach = __dependency3__.forEach;
 
@@ -18881,7 +18864,6 @@ enifed("ember-metal/utils",
     */
     var GUID_PREFIX = 'ember';
 
-    var o_create = create;
     // Used for guid generation...
     var numberCache  = [];
     var stringCache  = {};
@@ -19059,22 +19041,17 @@ enifed("ember-metal/utils",
       this.cache = {};
       this.cacheMeta = {};
       this.source = obj;
+      this.deps = undefined;
+      this.listeners = undefined;
+      this.mixins = undefined;
+      this.bindings = undefined;
+      this.chains = undefined;
+      this.values = undefined;
+      this.proto = undefined;
     }
 
     Meta.prototype = {
-      descs: null,
-      deps: null,
-      watching: null,
-      listeners: null,
-      cache: null,
-      cacheMeta: null,
-      source: null,
-      mixins: null,
-      bindings: null,
-      chains: null,
-      chainWatchers: null,
-      values: null,
-      proto: null
+      chainWatchers: null
     };
 
     if (!canDefineNonEnumerableProperties) {
@@ -19117,7 +19094,6 @@ enifed("ember-metal/utils",
       @return {Object} the meta hash for an object
     */
     function meta(obj, writable) {
-
       var ret = obj['__ember_meta__'];
       if (writable===false) return ret || EMPTY_META;
 
@@ -19309,8 +19285,8 @@ enifed("ember-metal/utils",
 
     /**
       Forces the passed object to be part of an array. If the object is already
-      an array or array-like, returns the object. Otherwise adds the object to
-      an array. If obj is `null` or `undefined`, returns an empty array.
+      an array or array-like, it will return the object. Otherwise, it will add the object to
+      an array. If obj is `null` or `undefined`, it will return an empty array.
 
       ```javascript
       Ember.makeArray();            // []
@@ -19712,16 +19688,13 @@ enifed("ember-metal/watch_key",
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
-    var meta = __dependency2__.meta;
+    var metaFor = __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 metaFor = meta; // utils.js
-
-
     function watchKey(obj, keyName, meta) {
       // can't watch length on Array - it is special...
       if (keyName === 'length' && typeOf(obj) === 'array') { return; }
@@ -19752,8 +19725,11 @@ enifed("ember-metal/watch_key",
     __exports__.watchKey = watchKey;
     
       var handleMandatorySetter = function handleMandatorySetter(m, obj, keyName) {
+        var descriptor = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, keyName);
+        var configurable = descriptor ? descriptor.configurable : true;
+
         // this x in Y deopts, so keeping it in this function is better;
-        if (keyName in obj) {
+        if (configurable && keyName in obj) {
           m.values[keyName] = obj[keyName];
           o_defineProperty(obj, keyName, {
             configurable: true,
@@ -19766,7 +19742,8 @@ enifed("ember-metal/watch_key",
     
 
     function unwatchKey(obj, keyName, meta) {
-      var m = meta || metaFor(obj), watching = m.watching;
+      var m = meta || metaFor(obj);
+      var watching = m.watching;
 
       if (watching[keyName] === 1) {
         watching[keyName] = 0;
@@ -19808,12 +19785,10 @@ enifed("ember-metal/watch_path",
   ["ember-metal/utils","ember-metal/chains","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var meta = __dependency1__.meta;
+    var metaFor = __dependency1__.meta;
     var typeOf = __dependency1__.typeOf;
     var ChainNode = __dependency2__.ChainNode;
 
-    var metaFor = meta;
-
     // get the chains for the current object. If the current object has
     // chains inherited from the proto they will be cloned and reconfigured for
     // the current object.
@@ -19865,10 +19840,7 @@ enifed("ember-metal/watching",
     @module ember-metal
     */
 
-    var meta = __dependency1__.meta;
-    var GUID_KEY = __dependency1__.GUID_KEY;
     var typeOf = __dependency1__.typeOf;
-    var generateGuid = __dependency1__.generateGuid;
     var removeChainWatcher = __dependency2__.removeChainWatcher;
     var flushPendingChains = __dependency2__.flushPendingChains;
     var watchKey = __dependency3__.watchKey;
@@ -19876,7 +19848,6 @@ enifed("ember-metal/watching",
     var watchPath = __dependency4__.watchPath;
     var unwatchPath = __dependency4__.unwatchPath;
 
-    var metaFor = meta; // utils.js
     var isPath = __dependency5__.isPath;
 
     /**
@@ -19923,31 +19894,7 @@ enifed("ember-metal/watching",
       }
     }
 
-    __exports__.unwatch = unwatch;/**
-      Call on an object when you first beget it from another object. This will
-      setup any chained watchers on the object instance as needed. This method is
-      safe to call multiple times.
-
-      @private
-      @method rewatch
-      @for Ember
-      @param obj
-    */
-    function rewatch(obj) {
-      var m = obj['__ember_meta__'], chains = m && m.chains;
-
-      // make sure the object has its own guid.
-      if (GUID_KEY in obj && !obj.hasOwnProperty(GUID_KEY)) {
-        generateGuid(obj);
-      }
-
-      // make sure any chained watchers update.
-      if (chains && chains.value() !== obj) {
-        m.chains = chains.copy(obj);
-      }
-    }
-
-    __exports__.rewatch = rewatch;var NODE_STACK = [];
+    __exports__.unwatch = unwatch;var NODE_STACK = [];
 
     /**
       Tears down the meta on an object so that it can be garbage collected.
@@ -19993,8 +19940,8 @@ enifed("ember-metal/watching",
     __exports__.destroy = destroy;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-handlebars","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__, __exports__) {
     "use strict";
     /**
     Ember Routing Handlebars
@@ -20006,26 +19953,19 @@ enifed("ember-routing-handlebars",
 
     var Ember = __dependency1__["default"];
     var EmberHandlebars = __dependency2__["default"];
-    var Router = __dependency3__["default"];
 
-    var resolvePaths = __dependency4__.resolvePaths;
-    var resolveParams = __dependency4__.resolveParams;
+    var deprecatedLinkToHelper = __dependency3__.deprecatedLinkToHelper;
+    var linkToHelper = __dependency3__.linkToHelper;
+    var LinkView = __dependency3__.LinkView;
+    var queryParamsHelper = __dependency3__.queryParamsHelper;
 
-    var deprecatedLinkToHelper = __dependency5__.deprecatedLinkToHelper;
-    var linkToHelper = __dependency5__.linkToHelper;
-    var LinkView = __dependency5__.LinkView;
-    var queryParamsHelper = __dependency5__.queryParamsHelper;
+    var outletHelper = __dependency4__.outletHelper;
+    var OutletView = __dependency4__.OutletView;
 
-    var outletHelper = __dependency6__.outletHelper;
-    var OutletView = __dependency6__.OutletView;
+    var renderHelper = __dependency5__["default"];
 
-    var renderHelper = __dependency7__["default"];
-
-    var ActionHelper = __dependency8__.ActionHelper;
-    var actionHelper = __dependency8__.actionHelper;
-
-    Router.resolveParams = resolveParams;
-    Router.resolvePaths = resolvePaths;
+    var ActionHelper = __dependency6__.ActionHelper;
+    var actionHelper = __dependency6__.actionHelper;
 
     Ember.LinkView = LinkView;
     EmberHandlebars.ActionHelper = ActionHelper;
@@ -20041,42 +19981,42 @@ enifed("ember-routing-handlebars",
     __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__) {
+  ["ember-metal/core","ember-metal/array","ember-metal/utils","ember-metal/run_loop","ember-views/streams/read","ember-views/system/utils","ember-views/system/action_manager","ember-handlebars","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Handlebars, uuid, FEATURES, assert, deprecate
-    var get = __dependency2__.get;
-    var forEach = __dependency3__.forEach;
-    var uuid = __dependency4__.uuid;
-    var run = __dependency5__["default"];
+    var forEach = __dependency2__.forEach;
+    var uuid = __dependency3__.uuid;
+    var run = __dependency4__["default"];
 
+    var readUnwrappedModel = __dependency5__.readUnwrappedModel;
     var isSimpleClick = __dependency6__.isSimpleClick;
     var ActionManager = __dependency7__["default"];
-    var EmberRouter = __dependency8__["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"];
 
     /**
     @module ember
     @submodule ember-routing
     */
 
-    var SafeString = EmberHandlebars.SafeString;
-    var a_slice = Array.prototype.slice;
+    function actionArgs(parameters, actionName) {
+      var ret, i;
 
-    function args(options, actionName) {
-      var ret = [];
-      if (actionName) { ret.push(actionName); }
+      if (actionName === undefined) {
+        ret = new Array(parameters.length);
+        for (i = 0; i < parameters.length; i++) {
+          ret[i] = readUnwrappedModel(parameters[i]);
+        }
+      } else {
+        ret = new Array(parameters.length + 1);
+        ret[0] = actionName;
+        for (i = 0; i < parameters.length; i++) {
+          ret[i + 1] = readUnwrappedModel(parameters[i]);
+        }
+      }
 
-      var types = options.options.types.slice(1);
-      var data = options.options.data;
-
-      return ret.concat(resolveParams(options.context, options.params, { types: types, data: data }));
+      return ret;
     }
 
     var ActionHelper = {};
@@ -20125,11 +20065,13 @@ enifed("ember-routing-handlebars/helpers/action",
       return isKeyEvent(eventName) && keyCode !== any && keyCode !== event.which.toString();
     }
 
-    ActionHelper.registerAction = function(actionNameOrPath, options, allowedKeys) {
+    ActionHelper.registerAction = function(actionNameOrStream, options, allowedKeys) {
       var actionId = uuid();
+      var eventName = options.eventName;
+      var parameters = options.parameters;
 
       ActionManager.registeredActions[actionId] = {
-        eventName: options.eventName,
+        eventName: eventName,
         handler: function handleRegisteredAction(event) {
           if (!isAllowedEvent(event, allowedKeys)) { return true; }
 
@@ -20141,37 +20083,32 @@ 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.value();
 
           
-          if (target.target) {
-            target = handlebarsGet(target.root, target.target, target.options);
-          } else {
-            target = target.root;
-          }
+          var actionName;
 
-          if (options.boundProperty) {
-            actionName = resolveParams(parameters.context, [actionNameOrPath], { types: ['ID'], data: parameters.options.data })[0];
+          if (actionNameOrStream.isStream) {
+            actionName = actionNameOrStream.value();
 
             if (typeof actionName === 'undefined' || typeof actionName === 'function') {
-              Ember.deprecate("You specified a quoteless path to the {{action}} helper '" + actionNameOrPath + "' which did not resolve to an actionName. Perhaps you meant to use a quoted actionName? (e.g. {{action '" + actionNameOrPath + "'}}).");
-              actionName = actionNameOrPath;
+              actionName = actionNameOrStream._originalPath;
+              Ember.deprecate("You specified a quoteless path to the {{action}} helper '" +
+                              actionName + "' which did not resolve to an actionName." +
+                              " Perhaps you meant to use a quoted actionName? (e.g. {{action '" + actionName + "'}}).");
             }
           }
 
           if (!actionName) {
-            actionName = actionNameOrPath;
+            actionName = actionNameOrStream;
           }
 
           run(function runRegisteredAction() {
             if (target.send) {
-              target.send.apply(target, args(parameters, actionName));
+              target.send.apply(target, actionArgs(parameters, actionName));
             } else {
               Ember.assert("The action '" + actionName + "' did not exist on " + target, typeof target[actionName] === 'function');
-              target[actionName].apply(target, args(parameters));
+              target[actionName].apply(target, actionArgs(parameters));
             }
           });
         }
@@ -20185,7 +20122,6 @@ enifed("ember-routing-handlebars/helpers/action",
     };
 
     /**
-
       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.
@@ -20349,64 +20285,70 @@ 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 length = arguments.length;
+      var options = arguments[length - 1];
+      var view = options.data.view;
       var hash = options.hash;
-      var controller = options.data.keywords.controller;
+      var types = options.types;
 
       // create a hash to pass along to registerAction
-      var action = {
+      var parameters = [];
+
+      var actionOptions = {
         eventName: hash.on || "click",
-        parameters: {
-          context: this,
-          options: options,
-          params: contexts
-        },
+        parameters: parameters,
         view: options.data.view,
         bubbles: hash.bubbles,
         preventDefault: hash.preventDefault,
-        target: { options: options },
-        withKeyCode: hash.withKeyCode,
-        boundProperty: options.types[0] === "ID"
+        target: view.getStream(hash.target || 'controller'),
+        withKeyCode: hash.withKeyCode
       };
 
-      if (hash.target) {
-        action.target.root = this;
-        action.target.target = hash.target;
-      } else if (controller) {
-        action.target.root = controller;
+      var actionNameStream;
+
+      if (types[0] === "ID") {
+        actionNameStream = view.getStream(actionName);
+        actionNameStream._originalPath = actionName;
+      } else {
+        actionNameStream = actionName;
       }
 
-      var actionId = ActionHelper.registerAction(actionName, action, hash.allowedKeys);
-      return new SafeString('data-ember-action="' + actionId + '"');
+      for (var i = 1; i < length - 1; i++) {
+        if (types[i] === "ID") {
+          parameters.push(view.getStream(arguments[i]));
+        } else {
+          parameters.push(arguments[i]);
+        }
+      }
+
+      var actionId = ActionHelper.registerAction(actionNameStream, actionOptions, hash.allowedKeys);
+      return new EmberHandlebars.SafeString('data-ember-action="' + actionId + '"');
     }
 
     __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"],
+  ["ember-metal/core","ember-metal/property_get","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/controller","ember-metal/keys","ember-views/system/utils","ember-views/views/component","ember-handlebars/helpers/view","ember-routing/utils","ember-handlebars/ext","ember-metal/streams/read","ember-handlebars","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"];
     // FEATURES, Logger, Handlebars, warn, assert
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var merge = __dependency4__["default"];
-    var run = __dependency5__["default"];
-    var computed = __dependency6__.computed;
+    var merge = __dependency3__["default"];
+    var run = __dependency4__["default"];
+    var computed = __dependency5__.computed;
+
+    var fmt = __dependency6__.fmt;
+    var EmberObject = __dependency7__["default"];
+    var ControllerMixin = __dependency8__["default"];
+    var keys = __dependency9__["default"];
+    var isSimpleClick = __dependency10__.isSimpleClick;
+    var EmberComponent = __dependency11__["default"];
+    var viewHelper = __dependency12__.viewHelper;
+    var routeArgs = __dependency13__.routeArgs;
+    var stringifyValue = __dependency14__.stringifyValue;
+    var read = __dependency15__.read;
 
-    var onLoad = __dependency7__.onLoad;
-    var fmt = __dependency8__.fmt;
-    var EmberObject = __dependency9__["default"];
-    var keys = __dependency10__["default"];
-    var isSimpleClick = __dependency11__.isSimpleClick;
-    var EmberComponent = __dependency12__["default"];
-    var EmberHandlebars = __dependency13__["default"];
-    var viewHelper = __dependency14__.viewHelper;
-    var EmberRouter = __dependency15__["default"];
-    var resolveParams = __dependency16__.resolveParams;
-    var resolvePaths = __dependency16__.resolvePaths;
-    var routeArgs = __dependency16__.routeArgs;
 
     /**
     @module ember
@@ -20415,8 +20357,6 @@ enifed("ember-routing-handlebars/helpers/link_to",
 
     var slice = [].slice;
 
-    requireModule('ember-handlebars');
-
     var numberOfContextsAcceptedByHandler = function(handler, handlerInfos) {
       var req = 0;
       for (var i = 0, l = handlerInfos.length; i < l; i++) {
@@ -20432,14 +20372,6 @@ enifed("ember-routing-handlebars/helpers/link_to",
       values: null
     });
 
-    function getResolvedPaths(options) {
-
-      var types = options.options.types;
-      var data = options.options.data;
-
-      return resolvePaths(options.context, options.params, { types: types, data: data });
-    }
-
     /**
       `Ember.LinkView` renders an element whose `click` event triggers a
       transition of the application's instance of `Ember.Router` to
@@ -20626,40 +20558,33 @@ 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 params = this.params;
 
-        if (linkTextPath) {
-          normalizedPath = getNormalizedPath(linkTextPath, helperParameters);
-          this.registerObserver(normalizedPath.root, normalizedPath.path, this, this.rerender);
+        var scheduledRerender = this._wrapAsScheduled(this.rerender);
+        var scheduledParamsChanged = this._wrapAsScheduled(this._paramsChanged);
+
+        if (this.linkTitle) {
+          this.linkTitle.subscribe(scheduledRerender, this);
         }
 
-        for(i=0; i < length; i++) {
-          path = paths[i];
-          if (null === path) {
-            // A literal value was provided, not a path, so nothing to observe.
-            continue;
+        for (var i = 0; i < params.length; i++) {
+          var param = params[i];
+          if (param && param.isStream) {
+            param.subscribe(scheduledParamsChanged, this);
           }
-
-          normalizedPath = getNormalizedPath(path, helperParameters);
-          this.registerObserver(normalizedPath.root, normalizedPath.path, this, this._paramsChanged);
         }
 
         var queryParamsObject = this.queryParamsObject;
         if (queryParamsObject) {
           var values = queryParamsObject.values;
-
-          // Install observers for all of the hash options
-          // provided in the (query-params) subexpression.
           for (var k in values) {
-            if (!values.hasOwnProperty(k)) { continue; }
+            if (!values.hasOwnProperty(k)) {
+              continue;
+            }
 
-            if (queryParamsObject.types[k] === 'ID') {
-              normalizedPath = getNormalizedPath(values[k], helperParameters);
-              this.registerObserver(normalizedPath.root, normalizedPath.path, this, this._paramsChanged);
+            var value = values[k];
+            if (value && value.isStream) {
+              value.subscribe(scheduledParamsChanged, this);
             }
           }
         }
@@ -20882,20 +20807,20 @@ 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 params = this.params;
+        var targetRouteName;
+        var models = [];
+        var onlyQueryParamsSupplied = (params.length === 0);
 
         if (onlyQueryParamsSupplied) {
           var appController = this.container.lookup('controller:application');
           targetRouteName = get(appController, 'currentRouteName');
-          models = [];
         } else {
-          models = resolveParams(parameters.context, parameters.params, { types: types, data: data });
-          targetRouteName = models.shift();
+          targetRouteName = read(params[0]);
+
+          for (var i = 1; i < params.length; i++) {
+            models.push(read(params[i]));
+          }
         }
 
         var suppliedQueryParams = getResolvedQueryParams(this, targetRouteName);
@@ -21258,24 +21183,33 @@ enifed("ember-routing-handlebars/helpers/link_to",
     function linkToHelper(name) {
       var options = slice.call(arguments, -1)[0];
       var params = slice.call(arguments, 0, -1);
+      var view = options.data.view;
       var hash = options.hash;
+      var hashTypes = options.hashTypes;
+      var types = options.types;
+      var shouldEscape = !hash.unescaped;
+      var queryParamsObject;
 
       Ember.assert("You must provide one or more parameters to the link-to helper.", params.length);
 
       if (params[params.length - 1] instanceof QueryParams) {
-        hash.queryParamsObject = params.pop();
+        hash.queryParamsObject = queryParamsObject = params.pop();
       }
 
-      hash.disabledBinding = hash.disabledWhen;
+      if (hash.disabledWhen) {
+        hash.disabledBinding = hash.disabledWhen;
+        hashTypes.disabledBinding = hashTypes.disabledWhen;
+        delete hash.disabledWhen;
+        delete hashTypes.disabledWhen;
+      }
 
       if (!options.fn) {
         var linkTitle = params.shift();
-        var linkType = options.types.shift();
-        var context = this;
-        if (linkType === 'ID') {
-          options.linkTextPath = linkTitle;
+        var linkTitleType = types.shift();
+        if (linkTitleType === 'ID') {
+          hash.linkTitle = linkTitle = view.getStream(linkTitle);
           options.fn = function() {
-            return EmberHandlebars.getEscaped(context, linkTitle, options);
+            return stringifyValue(linkTitle.value(), shouldEscape);
           };
         } else {
           options.fn = function() {
@@ -21284,11 +21218,24 @@ enifed("ember-routing-handlebars/helpers/link_to",
         }
       }
 
-      hash.parameters = {
-        context: this,
-        options: options,
-        params: params
-      };
+      // Setup route & param streams
+      for (var i = 0; i < params.length; i++) {
+        var paramPath = params[i];
+        if (types[i] === 'ID') {
+          var lazyValue = view.getStream(paramPath);
+
+          // TODO: Consider a better approach to unwrapping controllers.
+          if (paramPath !== 'controller') {
+            while (ControllerMixin.detect(lazyValue.value())) {
+              paramPath = (paramPath === '') ? 'model' : paramPath + '.model';
+              lazyValue = view.getStream(paramPath);
+            }
+          }
+          params[i] = lazyValue;
+        }
+      }
+
+      hash.params = params;
 
       options.helperName = options.helperName || 'link-to';
 
@@ -21296,6 +21243,13 @@ enifed("ember-routing-handlebars/helpers/link_to",
     }
 
     /**
+      This is a sub-expression to be used in conjunction with the link-to helper.
+      It will supply url query parameters to the target route.
+
+      Example
+
+      {#link-to 'posts' (query-params direction="asc")}}Sort{{/link-to}}
+
       @method query-params
       @for Ember.Handlebars.helpers
       @param {Object} hash takes a hash of query parameters
@@ -21304,9 +21258,18 @@ enifed("ember-routing-handlebars/helpers/link_to",
     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);
 
+      var view = options.data.view;
+      var hash = options.hash;
+      var hashTypes = options.hashTypes;
+
+      for (var k in hash) {
+        if (hashTypes[k] === 'ID') {
+          hash[k] = view.getStream(hash[k]);
+        }
+      }
+
       return QueryParams.create({
-        values: options.hash,
-        types: options.hashTypes
+        values: options.hash
       });
     }
 
@@ -21321,35 +21284,24 @@ enifed("ember-routing-handlebars/helpers/link_to",
       @return {String} HTML string
     */
     function deprecatedLinkToHelper() {
-      Ember.warn("The 'linkTo' view helper is deprecated in favor of 'link-to'");
+      Ember.deprecate("The 'linkTo' view helper is deprecated in favor of 'link-to'");
+
       return linkToHelper.apply(this, arguments);
     }
 
     function getResolvedQueryParams(linkView, targetRouteName) {
-      var helperParameters = linkView.parameters;
       var queryParamsObject = linkView.queryParamsObject;
       var resolvedQueryParams = {};
 
       if (!queryParamsObject) { return resolvedQueryParams; }
-      var rawParams = queryParamsObject.values;
 
-      for (var key in rawParams) {
-        if (!rawParams.hasOwnProperty(key)) { continue; }
-
-        var value = rawParams[key];
-        var type = queryParamsObject.types[key];
-
-        if (type === 'ID') {
-          var normalizedPath = getNormalizedPath(value, helperParameters);
-          value = EmberHandlebars.get(normalizedPath.root, normalizedPath.path, helperParameters.options);
-        }
-        resolvedQueryParams[key] = value;
+      var values = queryParamsObject.values;
+      for (var key in values) {
+        if (!values.hasOwnProperty(key)) { continue; }
+        resolvedQueryParams[key] = read(values[key]);
       }
-      return resolvedQueryParams;
-    }
 
-    function getNormalizedPath(path, helperParameters) {
-      return EmberHandlebars.normalizePath(helperParameters.context, path, helperParameters.options.data);
+      return resolvedQueryParams;
     }
 
     function paramsAreLoaded(params) {
@@ -21378,17 +21330,15 @@ enifed("ember-routing-handlebars/helpers/link_to",
     __exports__.linkToHelper = linkToHelper;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/property_set","ember-views/views/container_view","ember-handlebars/views/metamorph_view","ember-handlebars/helpers/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // assert
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var onLoad = __dependency4__.onLoad;
-    var ContainerView = __dependency5__["default"];
-    var _Metamorph = __dependency6__._Metamorph;
-    var viewHelper = __dependency7__.viewHelper;
+    var set = __dependency2__.set;
+    var ContainerView = __dependency3__["default"];
+    var _Metamorph = __dependency4__._Metamorph;
+    var viewHelper = __dependency5__.viewHelper;
 
     /**
     @module ember
@@ -21467,7 +21417,6 @@ enifed("ember-routing-handlebars/helpers/outlet",
     */
     function outletHelper(property, options) {
       var outletSource;
-      var container;
       var viewName;
       var viewClass;
       var viewFullName;
@@ -21477,26 +21426,42 @@ enifed("ember-routing-handlebars/helpers/outlet",
         property = 'main';
       }
 
-      container = options.data.view.container;
+      Ember.deprecate(
+        "Using {{outlet}} with an unquoted name is not supported. " +
+        "Please update to quoted usage '{{outlet \"" + property + "\"}}'.",
+        arguments.length === 1 || options.types[0] === 'STRING'
+      );
 
-      outletSource = options.data.view;
+      var view = options.data.view;
+      var container = view.container;
+
+      outletSource = view;
       while (!outletSource.get('template.isTop')) {
         outletSource = outletSource.get('_parentView');
       }
+      set(view, 'outletSource', outletSource);
 
       // provide controller override
       viewName = options.hash.view;
 
       if (viewName) {
         viewFullName = 'view:' + viewName;
-        Ember.assert("Using a quoteless view parameter with {{outlet}} is not supported. Please update to quoted usage '{{outlet \"" + viewName + "\"}}.", options.hashTypes.view !== 'ID');
-        Ember.assert("The view name you supplied '" + viewName + "' did not resolve to a view.", container.has(viewFullName));
+        Ember.assert(
+          "Using a quoteless view parameter with {{outlet}} is not supported." +
+          " Please update to quoted usage '{{outlet ... view=\"" + viewName + "\"}}.",
+          options.hashTypes.view !== 'ID'
+        );
+        Ember.assert(
+          "The view name you supplied '" + viewName + "' did not resolve to a view.",
+          container.has(viewFullName)
+        );
       }
 
       viewClass = viewName ? container.lookupFactory(viewFullName) : options.hash.viewClass || OutletView;
+      options.types = [ 'ID' ];
 
-      options.data.view.set('outletSource', outletSource);
       options.hash.currentViewBinding = '_view.outletSource._outlets.' + property;
+      options.hashTypes.currentViewBinding = 'STRING';
 
       options.helperName = options.helperName || 'outlet';
 
@@ -21506,20 +21471,16 @@ enifed("ember-routing-handlebars/helpers/outlet",
     __exports__.outletHelper = outletHelper;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/error","ember-runtime/system/string","ember-routing/system/generate_controller","ember-handlebars/helpers/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // assert, deprecate
     var EmberError = __dependency2__["default"];
-    var get = __dependency3__.get;
-    var set = __dependency4__.set;
-    var camelize = __dependency5__.camelize;
-    var generateControllerFactory = __dependency6__.generateControllerFactory;
-    var generateController = __dependency6__["default"];
-    var handlebarsGet = __dependency7__.handlebarsGet;
-    var ViewHelper = __dependency8__.ViewHelper;
-
+    var camelize = __dependency3__.camelize;
+    var generateControllerFactory = __dependency4__.generateControllerFactory;
+    var generateController = __dependency4__["default"];
+    var ViewHelper = __dependency5__.ViewHelper;
 
     /**
     @module ember
@@ -21550,7 +21511,7 @@ enifed("ember-routing-handlebars/helpers/render",
       Hello, {{who}}.
       ```
 
-      ```handelbars
+      ```handlebars
       <!-- application.hbs -->
       <h1>My great app</h1>
       {{render "navigation"}}
@@ -21598,25 +21559,26 @@ 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 container, router, controller, view, initialContext;
 
-      container = (options || contextString).data.keywords.controller.container;
+      container = (options || contextString).data.view._keywords.controller.value().container;
       router = container.lookup('router:main');
 
       if (length === 2) {
         // use the singleton controller
         options = contextString;
         contextString = undefined;
-        Ember.assert("You can only use the {{render}} helper once without a model object as its second argument, as in {{render \"post\" post}}.", !router || !router._lookupActiveView(name));
+        Ember.assert("You can only use the {{render}} helper once without a model object as its" +
+                     " second argument, as in {{render \"post\" post}}.", !router || !router._lookupActiveView(name));
       } else if (length === 3) {
         // create a new controller
-        context = handlebarsGet(options.contexts[1], contextString, options);
+        initialContext = options.data.view.getStream(contextString).value();
       } else {
         throw new EmberError("You must pass a templateName to render");
       }
 
-      Ember.deprecate("Using a quoteless parameter with {{render}} is deprecated. Please update to quoted usage '{{render \"" + name + "\"}}.", options.types[0] !== 'ID');
+      Ember.deprecate("Using a quoteless parameter with {{render}} is deprecated. Please update to" +
+                      " quoted usage '{{render \"" + name + "\"}}.", options.types[0] !== 'ID');
 
       // # legacy namespace
       name = name.replace(/\//g, '.');
@@ -21630,18 +21592,19 @@ enifed("ember-routing-handlebars/helpers/render",
       var controllerFullName = 'controller:' + controllerName;
 
       if (options.hash.controller) {
-        Ember.assert("The controller name you supplied '" + controllerName + "' did not resolve to a controller.", container.has(controllerFullName));
+        Ember.assert("The controller name you supplied '" + controllerName +
+                     "' did not resolve to a controller.", container.has(controllerFullName));
       }
 
-      var parentController = options.data.keywords.controller;
+      var parentController = options.data.view._keywords.controller.value();
 
       // choose name
       if (length > 2) {
         var factory = container.lookupFactory(controllerFullName) ||
-                      generateControllerFactory(container, controllerName, context);
+                      generateControllerFactory(container, controllerName, initialContext);
 
         controller = factory.create({
-          model: context,
+          modelBinding: options.data.view._getBindingForStream(contextString),
           parentController: parentController,
           target: parentController
         });
@@ -21659,23 +21622,16 @@ enifed("ember-routing-handlebars/helpers/render",
         });
       }
 
-      var root = options.contexts[1];
-
-      if (root) {
-        view.registerObserver(root, contextString, function() {
-          controller.set('model', handlebarsGet(root, contextString, options));
-        });
-      }
-
       options.hash.viewName = camelize(name);
 
       var templateName = 'template:' + name;
-      Ember.assert("You used `{{render '" + name + "'}}`, but '" + name + "' can not be found as either a template or a view.", container.has("view:" + name) || container.has(templateName) || options.fn);
+      Ember.assert("You used `{{render '" + name + "'}}`, but '" + name + "' can not be found as either" +
+                   " a template or a view.", container.has("view:" + name) || container.has(templateName) || options.fn);
       options.hash.template = container.lookup(templateName);
 
       options.hash.controller = controller;
 
-      if (router && !context) {
+      if (router && !initialContext) {
         router._connectActiveView(name, view);
       }
 
@@ -21684,102 +21640,9 @@ enifed("ember-routing-handlebars/helpers/render",
       ViewHelper.instanceHelper(this, view, options);
     }
   });
-enifed("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";
-    var get = __dependency1__.get;
-    var map = __dependency2__.map;
-    var ControllerMixin = __dependency3__["default"];
-    var handlebarsResolve = __dependency4__.resolveParams;
-    var handlebarsGet = __dependency4__.handlebarsGet;
-    var typeOf = __dependency5__.typeOf;
-    var get = __dependency1__.get;
-
-    function routeArgs(targetRouteName, models, queryParams) {
-      var args = [];
-      if (typeOf(targetRouteName) === 'string') {
-        args.push('' + targetRouteName);
-      }
-      args.push.apply(args, models);
-      args.push({ queryParams: queryParams });
-      return args;
-    }
-
-    __exports__.routeArgs = routeArgs;function getActiveTargetName(router) {
-      var handlerInfos = router.activeTransition ?
-                         router.activeTransition.state.handlerInfos :
-                         router.state.handlerInfos;
-      return handlerInfos[handlerInfos.length - 1].name;
-    }
-
-    __exports__.getActiveTargetName = getActiveTargetName;function resolveParams(context, params, options) {
-      return map.call(resolvePaths(context, params, options), function(path, i) {
-        if (null === path) {
-          // Param was string/number, not a path, so just return raw string/number.
-          return params[i];
-        } else {
-          return handlebarsGet(context, path, options);
-        }
-      });
-    }
-
-    __exports__.resolveParams = resolveParams;function stashParamNames(router, handlerInfos) {
-      if (handlerInfos._namesStashed) { return; }
-
-      // This helper exists because router.js/route-recognizer.js awkwardly
-      // keeps separate a handlerInfo's list of parameter names depending
-      // on whether a URL transition or named transition is happening.
-      // Hopefully we can remove this in the future.
-      var targetRouteName = handlerInfos[handlerInfos.length-1].name;
-      var recogHandlers = router.router.recognizer.handlersFor(targetRouteName);
-      var dynamicParent = null;
-
-      for (var i = 0, len = handlerInfos.length; i < len; ++i) {
-        var handlerInfo = handlerInfos[i];
-        var names = recogHandlers[i].names;
-
-        if (names.length) {
-          dynamicParent = handlerInfo;
-        }
-
-        handlerInfo._names = names;
-
-        var route = handlerInfo.handler;
-        route._stashNames(handlerInfo, dynamicParent);
-      }
-
-      handlerInfos._namesStashed = true;
-    }
-
-    __exports__.stashParamNames = stashParamNames;function resolvePaths(context, params, options) {
-      var resolved = handlebarsResolve(context, params, options);
-      var types = options.types;
-
-      return map.call(resolved, function(object, i) {
-        if (types[i] === 'ID') {
-          return unwrap(object, params[i]);
-        } else {
-          return null;
-        }
-      });
-
-      function unwrap(object, path) {
-        if (path === 'controller') { return path; }
-
-        if (ControllerMixin.detect(object)) {
-          return unwrap(get(object, 'model'), path ? path + '.model' : 'model');
-        } else {
-          return path;
-        }
-      }
-    }
-
-    __exports__.resolvePaths = resolvePaths;
-  });
 enifed("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__) {
+  ["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__, __exports__) {
     "use strict";
     /**
     Ember Routing
@@ -21789,23 +21652,22 @@ enifed("ember-routing",
     @requires ember-views
     */
 
-    var EmberHandlebars = __dependency1__["default"];
-    var Ember = __dependency2__["default"];
+    var Ember = __dependency1__["default"];
 
     // ES6TODO: Cleanup modules with side-effects below
 
-    var EmberLocation = __dependency6__["default"];
-    var NoneLocation = __dependency7__["default"];
-    var HashLocation = __dependency8__["default"];
-    var HistoryLocation = __dependency9__["default"];
-    var AutoLocation = __dependency10__["default"];
+    var EmberLocation = __dependency5__["default"];
+    var NoneLocation = __dependency6__["default"];
+    var HashLocation = __dependency7__["default"];
+    var HistoryLocation = __dependency8__["default"];
+    var AutoLocation = __dependency9__["default"];
 
-    var generateControllerFactory = __dependency11__.generateControllerFactory;
-    var generateController = __dependency11__["default"];
-    var controllerFor = __dependency12__["default"];
-    var RouterDSL = __dependency13__["default"];
-    var Router = __dependency14__["default"];
-    var Route = __dependency15__["default"];
+    var generateControllerFactory = __dependency10__.generateControllerFactory;
+    var generateController = __dependency10__["default"];
+    var controllerFor = __dependency11__["default"];
+    var RouterDSL = __dependency12__["default"];
+    var Router = __dependency13__["default"];
+    var Route = __dependency14__["default"];
 
     Ember.Location = EmberLocation;
     Ember.AutoLocation = AutoLocation;
@@ -21823,8 +21685,8 @@ enifed("ember-routing",
     __exports__["default"] = Ember;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/utils","ember-metal/merge","ember-runtime/mixins/controller","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // FEATURES, deprecate
@@ -21834,9 +21696,8 @@ enifed("ember-routing/ext/controller",
     var typeOf = __dependency5__.typeOf;
     var meta = __dependency5__.meta;
     var merge = __dependency6__["default"];
-    var map = __dependency7__.map;
 
-    var ControllerMixin = __dependency8__["default"];
+    var ControllerMixin = __dependency7__["default"];
 
     /**
     @module ember
@@ -21852,6 +21713,11 @@ enifed("ember-routing/ext/controller",
       },
 
       /**
+        Defines which query parameters the controller accepts.
+        If you give the names ['category','page'] it will bind
+        the values of these query parameters to the variables
+        `this.category` and `this.page`
+
         @property queryParams
         @public
       */
@@ -22178,8 +22044,6 @@ enifed("ember-routing/ext/run_loop",
     // resolve), which is used in router transitions to prevent unnecessary
     // loading state entry if all context promises resolve on the
     // 'actions' queue first.
-
-    var queues = run.queues;
     run._addQueue('routerTransitions', 'actions');
   });
 enifed("ember-routing/ext/view",
@@ -22204,7 +22068,7 @@ enifed("ember-routing/ext/view",
         @method init
        */
       init: function() {
-        set(this, '_outlets', {});
+        this._outlets = {};
         this._super();
       },
 
@@ -22340,13 +22204,11 @@ enifed("ember-routing/ext/view",
     __exports__["default"] = EmberView;
   });
 enifed("ember-routing/location/api",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/core","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // deprecate, assert
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
 
     /**
     @module ember
@@ -22519,7 +22381,8 @@ enifed("ember-routing/location/api",
        container directly.
       */
       registerImplementation: function(name, implementation) {
-        Ember.deprecate('Using the Ember.Location.registerImplementation is no longer supported. Register your custom location implementation with the container instead.', false);
+        Ember.deprecate('Using the Ember.Location.registerImplementation is no longer supported.' +
+                        ' Register your custom location implementation with the container instead.', false);
 
         this.implementations[name] = implementation;
       },
@@ -22552,18 +22415,17 @@ enifed("ember-routing/location/api",
     };
   });
 enifed("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__) {
+  ["ember-metal/core","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__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // FEATURES
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
+    var set = __dependency2__.set;
 
-    var EmberLocation = __dependency4__["default"];
-    var HistoryLocation = __dependency5__["default"];
-    var HashLocation = __dependency6__["default"];
-    var NoneLocation = __dependency7__["default"];
+    var EmberLocation = __dependency3__["default"];
+    var HistoryLocation = __dependency4__["default"];
+    var HashLocation = __dependency5__["default"];
+    var NoneLocation = __dependency6__["default"];
 
     /**
     @module ember
@@ -22892,7 +22754,8 @@ enifed("ember-routing/location/auto_location",
       */
       create: function (options) {
         if (options && options.rootURL) {
-          Ember.assert('rootURL must end with a trailing forward slash e.g. "/app/"', options.rootURL.charAt(options.rootURL.length-1) === '/');
+          Ember.assert('rootURL must end with a trailing forward slash e.g. "/app/"',
+                       options.rootURL.charAt(options.rootURL.length-1) === '/');
           this.rootURL = options.rootURL;
         }
 
@@ -22990,15 +22853,33 @@ enifed("ember-routing/location/hash_location",
       getHash: EmberLocation._getHash,
 
       /**
-        Returns the current `location.hash`, minus the '#' at the front.
+        Returns the normalized URL, constructed from `location.hash`.
+
+        e.g. `#/foo` => `/foo` as well as `#/foo#bar` => `/foo#bar`.
+
+        By convention, hashed paths must begin with a forward slash, otherwise they
+        are not treated as a path so we can distinguish intent.
 
         @private
         @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;
+        var originalPath = this.getHash().substr(1);
+        var outPath = originalPath;
+        
+        if (outPath.charAt(0) !== '/') {
+          outPath = '/';
+
+          // Only add the # if the path isn't empty.
+          // We do NOT want `/#` since the ampersand
+          // is only included (conventionally) when
+          // the location.hash has a value
+          if (originalPath) {
+            outPath += '#' + originalPath;
+          }
+        }
+
+        return outPath;
       },
 
       /**
@@ -23082,16 +22963,15 @@ enifed("ember-routing/location/hash_location",
     });
   });
 enifed("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"],
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/object","ember-routing/location/api","ember-views/system/jquery","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    // FEATURES
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var guidFor = __dependency4__.guidFor;
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var guidFor = __dependency3__.guidFor;
 
-    var EmberObject = __dependency5__["default"];
+    var EmberObject = __dependency4__["default"];
+    var EmberLocation = __dependency5__["default"];
     var jQuery = __dependency6__["default"];
 
     /**
@@ -23157,6 +23037,7 @@ enifed("ember-routing/location/history_location",
         var search = location.search || '';
 
         url += search;
+        url += this.getHash();
 
         return url;
       },
@@ -23238,7 +23119,6 @@ enifed("ember-routing/location/history_location",
       */
       replaceState: function(path) {
         var state = { path: path };
-
         get(this, 'history').replaceState(state, null, path);
 
         // store state if browser doesn't support `history.state`
@@ -23304,7 +23184,16 @@ enifed("ember-routing/location/history_location",
         var guid = guidFor(this);
 
         jQuery(window).off('popstate.ember-location-'+guid);
-      }
+      },
+
+      /**
+        @private
+
+        Returns normalized location.hash
+
+        @method getHash
+      */
+      getHash: EmberLocation._getHash
     });
   });
 enifed("ember-routing/location/none_location",
@@ -23490,28 +23379,20 @@ enifed("ember-routing/system/dsl",
         var type = options.resetNamespace === true ? 'resource' : 'route';
         Ember.assert("'basic' cannot be used as a " + type + " name.", name !== 'basic');
 
-
-        if (typeof options.path !== 'string') {
-          options.path = "/" + name;
-        }
-
-        if (canNest(this) && options.resetNamespace !== true) {
-          name = this.parent + "." + name;
-        }
-
+        
         if (callback) {
-          var dsl = new DSL(name);
-          route(dsl, 'loading');
-          route(dsl, 'error', { path: "/_unused_dummy_error_path_route_" + name + "/:error" });
+          var fullName = getFullName(this, name, options.resetNamespace);
+          var dsl = new DSL(fullName);
+          createRoute(dsl, 'loading');
+          createRoute(dsl, 'error', { path: "/_unused_dummy_error_path_route_" + name + "/:error" });
 
-          if (callback) { callback.call(dsl); }
+          callback.call(dsl);
 
-          this.push(options.path, name, dsl.generate());
+          createRoute(this, name, options, dsl.generate());
         } else {
-          this.push(options.path, name, null);
+          createRoute(this, name, options);
         }
-
-              },
+      },
 
       push: function(url, name, callback) {
         var parts = name.split('.');
@@ -23538,13 +23419,13 @@ enifed("ember-routing/system/dsl",
         var dslMatches = this.matches;
 
         if (!this.explicitIndex) {
-          route(this, "index", { path: "/" });
+          this.route("index", { path: "/" });
         }
 
         return function(match) {
           for (var i=0, l=dslMatches.length; i<l; i++) {
             var dslMatch = dslMatches[i];
-            var matchObj = match(dslMatch[0]).to(dslMatch[1], dslMatch[2]);
+            match(dslMatch[0]).to(dslMatch[1], dslMatch[2]);
           }
         };
       }
@@ -23554,20 +23435,24 @@ enifed("ember-routing/system/dsl",
       return dsl.parent && dsl.parent !== 'application';
     }
 
-    function route(dsl, name, options) {
-      Ember.assert("You must use `this.resource` to nest", typeof options !== 'function');
+    function getFullName(dsl, name, resetNamespace) {
+      if (canNest(dsl) && resetNamespace !== true) {
+        return dsl.parent + "." + name;
+      } else {
+        return name;
+      }
+    }
 
+    function createRoute(dsl, name, options, callback) {
       options = options || {};
 
+      var fullName = getFullName(dsl, name, options.resetNamespace);
+
       if (typeof options.path !== 'string') {
         options.path = "/" + name;
       }
 
-      if (canNest(dsl) && options.resetNamespace !== true) {
-        name = dsl.parent + "." + name;
-      }
-
-      dsl.push(options.path, name, null);
+      dsl.push(options.path, fullName, callback);
     }
 
     DSL.map = function(callback) {
@@ -23607,7 +23492,7 @@ enifed("ember-routing/system/generate_controller",
     */
 
     function generateControllerFactory(container, controllerName, context) {
-      var Factory, fullName, instance, name, factoryName, controllerType;
+      var Factory, fullName, factoryName, controllerType;
 
       if (context && isArray(context)) {
         controllerType = 'array';
@@ -23659,8 +23544,8 @@ enifed("ember-routing/system/generate_controller",
     }
   });
 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"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
+  ["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/evented","ember-runtime/mixins/action_handler","ember-routing/system/generate_controller","ember-routing/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // FEATURES, K, A, deprecate, assert, Logger
@@ -23670,7 +23555,7 @@ enifed("ember-routing/system/route",
     var getProperties = __dependency5__["default"];
     var forEach = __dependency6__.forEach;
     var replace = __dependency6__.replace;
-    var isNone = __dependency7__.isNone;
+    var isNone = __dependency7__["default"];
     var computed = __dependency8__.computed;
     var merge = __dependency9__["default"];
     var isArray = __dependency10__.isArray;
@@ -23679,11 +23564,13 @@ enifed("ember-routing/system/route",
     var keys = __dependency12__["default"];
     var copy = __dependency13__["default"];
     var classify = __dependency14__.classify;
-    var fmt = __dependency14__.fmt;
     var EmberObject = __dependency15__["default"];
-    var ActionHandler = __dependency16__["default"];
-    var generateController = __dependency17__["default"];
-    var stashParamNames = __dependency18__.stashParamNames;
+    var Evented = __dependency16__["default"];
+    var ActionHandler = __dependency17__["default"];
+    var generateController = __dependency18__["default"];
+    var stashParamNames = __dependency19__.stashParamNames;
+
+    var slice = Array.prototype.slice;
 
     /**
     @module ember
@@ -23705,7 +23592,7 @@ enifed("ember-routing/system/route",
         configuration options and their defaults are as follows
         (assuming a query param whose URL key is `page`):
 
-        ```js
+        ```javascript
         queryParams: {
           page: {
             // By default, controller query param properties don't
@@ -23882,7 +23769,12 @@ enifed("ember-routing/system/route",
       mergedProperties: ['events', 'queryParams'],
 
       /**
+        Retrieves parameters, for current route using the state.params
+        variable and getQueryParamsFor, using the supplied routeName.
+
         @method paramsFor
+        @param {String} routename
+
       */
       paramsFor: function(name) {
         var route = this.container.lookup('route:' + name);
@@ -23902,14 +23794,22 @@ enifed("ember-routing/system/route",
       },
 
       /**
+        Serializes the query parameter key
+
         @method serializeQueryParamKey
+        @param {String} controllerPropertyName
       */
       serializeQueryParamKey: function(controllerPropertyName) {
         return controllerPropertyName;
       },
 
       /**
+        Serializes value of the query parameter based on defaultValueType
+
         @method serializeQueryParam
+        @param {Object} value
+        @param {String} urlKey
+        @param {String} defaultValueType
       */
       serializeQueryParam: function(value, urlKey, defaultValueType) {
         // urlKey isn't used here, but anyone overriding
@@ -23922,7 +23822,12 @@ enifed("ember-routing/system/route",
       },
 
       /**
+        Deserializes value of the query parameter based on defaultValueType
+
         @method deserializeQueryParam
+        @param {Object} value
+        @param {String} urlKey
+        @param {String} defaultValueType
       */
       deserializeQueryParam: function(value, urlKey, defaultValueType) {
         // urlKey isn't used here, but anyone overriding
@@ -23951,11 +23856,20 @@ enifed("ember-routing/system/route",
         this.router._queuedQPChanges = {};
       },
 
+      /**
+        @private
+
+        @property _optionsForQueryParam
+      */
+      _optionsForQueryParam: function(qp) {
+        return get(this, 'queryParams.' + qp.urlKey) || get(this, 'queryParams.' + qp.prop) || {};
+      },
+
       /**
         A hook you can use to reset controller values either when the model
         changes or the route is exiting.
 
-        ```js
+        ```javascript
         App.ArticlesRoute = Ember.Route.extend({
           // ...
 
@@ -23982,6 +23896,9 @@ enifed("ember-routing/system/route",
       */
       exit: function() {
         this.deactivate();
+        
+          this.trigger('deactivate');
+        
         this.teardownViews();
       },
 
@@ -24006,6 +23923,9 @@ enifed("ember-routing/system/route",
       */
       enter: function() {
         this.activate();
+        
+          this.trigger('activate');
+        
       },
 
       /**
@@ -24019,7 +23939,7 @@ enifed("ember-routing/system/route",
         because it doesn't require a custom `renderTemplate` method. For example,
         the following routes will all render using the `App.PostsListView` view:
 
-        ```js
+        ```javascript
         var PostsList = Ember.Route.extend({
           viewName: 'postsList'
         });
@@ -24042,7 +23962,7 @@ enifed("ember-routing/system/route",
         This is similar with `viewName`, but is useful when you just want a custom
         template without a view.
 
-        ```js
+        ```javascript
         var PostsList = Ember.Route.extend({
           templateName: 'posts/list'
         });
@@ -24088,7 +24008,7 @@ enifed("ember-routing/system/route",
         A good example is preventing navigation when a form is
         half-filled out:
 
-        ```js
+        ```javascript
         App.ContactFormRoute = Ember.Route.extend({
           actions: {
             willTransition: function(transition) {
@@ -24122,7 +24042,7 @@ enifed("ember-routing/system/route",
         however, it can be useful for tracking page views or resetting
         state on the controller.
 
-        ```js
+        ```javascript
         App.LoginRoute = Ember.Route.extend({
           actions: {
             didTransition: function() {
@@ -24143,7 +24063,7 @@ enifed("ember-routing/system/route",
         `Transition` object is the first parameter and the route that
         triggered the loading event is the second parameter.
 
-        ```js
+        ```javascript
         App.ApplicationRoute = Ember.Route.extend({
           actions: {
             loading: function(transition, route) {
@@ -24152,9 +24072,10 @@ enifed("ember-routing/system/route",
               })
               .append();
 
-              this.router.one('didTransition', function () {
+              this.router.one('didTransition', function() {
                 view.destroy();
               });
+
               return true; // Bubble the loading event
             }
           }
@@ -24178,10 +24099,10 @@ enifed("ember-routing/system/route",
         for rejected promises from the various hooks on the route,
         as well as any unhandled errors from child routes:
 
-        ```js
+        ```javascript
         App.AdminRoute = Ember.Route.extend({
           beforeModel: function() {
-            return Ember.RSVP.reject("bad things!");
+            return Ember.RSVP.reject('bad things!');
           },
 
           actions: {
@@ -24207,7 +24128,7 @@ enifed("ember-routing/system/route",
         specify your own global default error handler by overriding the
         `error` handler on `ApplicationRoute`:
 
-        ```js
+        ```javascript
         App.ApplicationRoute = Ember.Route.extend({
           actions: {
             error: function(error, transition) {
@@ -24231,7 +24152,7 @@ enifed("ember-routing/system/route",
           actions: {
             willTransition: function(transition) {
               if (this.controller.get('userHasEnteredData') &&
-                  !confirm("Are you sure you want to abandon progress?")) {
+                  !confirm('Are you sure you want to abandon progress?')) {
                 transition.abort();
               } else {
                 // Bubble the `willTransition` action so that
@@ -24251,11 +24172,12 @@ enifed("ember-routing/system/route",
       _actions: {
 
         queryParamsDidChange: function(changed, totalPresent, removed) {
+          var qpMap = this.get('_qp').map;
+
           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')) {
+            var qp = qpMap[totalChanged[i]];
+            if (qp && get(this._optionsForQueryParam(qp), 'refreshModel')) {
               this.refresh();
             }
           }
@@ -24306,9 +24228,8 @@ enifed("ember-routing/system/route",
 
             var thisQueryParamChanged = (svalue !== qp.svalue);
             if (thisQueryParamChanged) {
-              var options = get(route, 'queryParams.' + qp.urlKey) || {};
-
               if (transition.queryParamsOnly && replaceUrl !== false) {
+                var options = route._optionsForQueryParam(qp);
                 var replaceConfigValue = get(options, 'replace');
                 if (replaceConfigValue) {
                   replaceUrl = true;
@@ -24402,8 +24323,8 @@ enifed("ember-routing/system/route",
 
         ```javascript
         App.Router.map(function() {
-          this.resource('blogPost', {path:':blogPostId'}, function(){
-            this.resource('blogComment', {path: ':blogCommentId'});
+          this.resource('blogPost', { path:':blogPostId' }, function() {
+            this.resource('blogComment', { path: ':blogCommentId' });
           });
         });
 
@@ -24426,18 +24347,19 @@ enifed("ember-routing/system/route",
 
         ```javascript
         App.Router.map(function() {
-          this.route("index");
-          this.route("secret");
-          this.route("fourOhFour", { path: "*:"});
+          this.route('index');
+          this.route('secret');
+          this.route('fourOhFour', { path: '*:' });
         });
 
         App.IndexRoute = Ember.Route.extend({
           actions: {
-            moveToSecret: function(context){
-              if (authorized()){
+            moveToSecret: function(context) {
+              if (authorized()) {
                 this.transitionTo('secret', context);
-              }
+              } else {
                 this.transitionTo('fourOhFour');
+              }
             }
           }
         });
@@ -24465,17 +24387,18 @@ enifed("ember-routing/system/route",
 
         ```javascript
         App.Router.map(function() {
-          this.route("index");
-          this.resource('breakfast', {path:':breakfastId'}, function(){
-            this.resource('cereal', {path: ':cerealId'});
+          this.route('index');
+
+          this.resource('breakfast', { path: ':breakfastId' }, function() {
+            this.resource('cereal', { path: ':cerealId' });
           });
         });
 
         App.IndexRoute = Ember.Route.extend({
           actions: {
-            moveToChocolateCereal: function(){
-              var cereal = { cerealId: "ChocolateYumminess"},
-                  breakfast = {breakfastId: "CerealAndMilk"};
+            moveToChocolateCereal: function() {
+              var cereal = { cerealId: 'ChocolateYumminess' };
+              var breakfast = { breakfastId: 'CerealAndMilk' };
 
               this.transitionTo('cereal', breakfast, cereal);
             }
@@ -24551,8 +24474,8 @@ enifed("ember-routing/system/route",
 
         ```javascript
         App.Router.map(function() {
-          this.route("index");
-          this.route("secret");
+          this.route('index');
+          this.route('secret');
         });
 
         App.SecretRoute = Ember.Route.extend({
@@ -24611,7 +24534,16 @@ enifed("ember-routing/system/route",
         @param {...*} args
       */
       send: function() {
-        return this.router.send.apply(this.router, arguments);
+        if (this.router || !Ember.testing) {
+          this.router.send.apply(this.router, arguments);
+        } else {
+          var name = arguments[0];
+          var args = slice.call(arguments, 1);
+          var action = this._actions[name];
+          if (action) {
+            return this._actions[name].apply(this, args);
+          }
+        }
       },
 
       /**
@@ -24684,7 +24616,7 @@ enifed("ember-routing/system/route",
         be useful, for instance, for retrieving async code from
         the server that is required to enter a route.
 
-        ```js
+        ```javascript
         App.PostRoute = Ember.Route.extend({
           beforeModel: function(transition) {
             if (!App.Post) {
@@ -24705,7 +24637,7 @@ enifed("ember-routing/system/route",
         from the shared error handling behavior of the `error`
         hook):
 
-        ```js
+        ```javascript
         App.PostRoute = Ember.Route.extend({
           beforeModel: function(transition) {
             if (!App.Post) {
@@ -24746,7 +24678,7 @@ enifed("ember-routing/system/route",
         logic that can only take place after the model has already
         resolved.
 
-        ```js
+        ```javascript
         App.PostsRoute = Ember.Route.extend({
           afterModel: function(posts, transition) {
             if (posts.get('length') === 1) {
@@ -24812,9 +24744,9 @@ enifed("ember-routing/system/route",
         A hook you can implement to convert the URL into the model for
         this route.
 
-        ```js
+        ```javascript
         App.Router.map(function() {
-          this.resource('post', {path: '/posts/:post_id'});
+          this.resource('post', { path: '/posts/:post_id' });
         });
         ```
 
@@ -24838,7 +24770,7 @@ enifed("ember-routing/system/route",
 
         Routes without dynamic segments will always execute the model hook.
 
-        ```js
+        ```javascript
         // no dynamic segment, model hook always called
         this.transitionTo('posts');
 
@@ -24858,7 +24790,7 @@ enifed("ember-routing/system/route",
 
         Example
 
-        ```js
+        ```javascript
         App.PostRoute = Ember.Route.extend({
           model: function(params) {
             return this.store.find('post', params.post_id);
@@ -24968,15 +24900,15 @@ enifed("ember-routing/system/route",
         A hook you can implement to convert the route's model into parameters
         for the URL.
 
-        ```js
+        ```javascript
         App.Router.map(function() {
-          this.resource('post', {path: '/posts/:post_id'});
+          this.resource('post', { path: '/posts/:post_id' });
         });
 
         App.PostRoute = Ember.Route.extend({
           model: function(params) {
             // the server returns `{ id: 12 }`
-            return jQuery.getJSON("/posts/" + params.post_id);
+            return Ember.$.getJSON('/posts/' + params.post_id);
           },
 
           serialize: function(model) {
@@ -25029,7 +24961,7 @@ enifed("ember-routing/system/route",
         when implementing your `setupController` function, make sure to call
         `_super`:
 
-        ```js
+        ```javascript
         App.PhotosRoute = Ember.Route.extend({
           model: function() {
             return this.store.find('photo');
@@ -25059,9 +24991,9 @@ enifed("ember-routing/system/route",
 
         As an example, consider the router:
 
-        ```js
+        ```javascript
         App.Router.map(function() {
-          this.resource('post', {path: '/posts/:post_id'});
+          this.resource('post', { path: '/posts/:post_id' });
         });
         ```
 
@@ -25071,7 +25003,7 @@ enifed("ember-routing/system/route",
 
         Example
 
-        ```js
+        ```javascript
         App.PostRoute = Ember.Route.extend({
           setupController: function(controller, model) {
             controller.set('model', model);
@@ -25095,7 +25027,7 @@ enifed("ember-routing/system/route",
         The controller instance must already have been created, either through entering the
         associated route or using `generateController`.
 
-        ```js
+        ```javascript
         App.PostRoute = Ember.Route.extend({
           setupController: function(controller, post) {
             this._super(controller, post);
@@ -25139,7 +25071,7 @@ enifed("ember-routing/system/route",
 
         Example
 
-        ```js
+        ```javascript
         App.PostRoute = Ember.Route.extend({
           setupController: function(controller, post) {
             this._super(controller, post);
@@ -25171,7 +25103,7 @@ enifed("ember-routing/system/route",
 
         Example
 
-        ```js
+        ```javascript
         App.Router.map(function() {
             this.resource('post', { path: '/post/:post_id' }, function() {
                 this.resource('comments');
@@ -25215,7 +25147,7 @@ enifed("ember-routing/system/route",
         This method can be overridden to set up and render additional or
         alternative templates.
 
-        ```js
+        ```javascript
         App.PostsRoute = Ember.Route.extend({
           renderTemplate: function(controller, model) {
             var favController = this.controllerFor('favoritePost');
@@ -25247,7 +25179,7 @@ enifed("ember-routing/system/route",
 
         For example, given the following minimal router and templates:
 
-        ```js
+        ```javascript
         Router.map(function() {
           this.resource('photos');
         });
@@ -25268,7 +25200,7 @@ enifed("ember-routing/system/route",
         You can render `photos.hbs` into the `"anOutletName"` outlet of
         `application.hbs` by calling `render`:
 
-        ```js
+        ```javascript
         // posts route
         Ember.Route.extend({
           renderTemplate: function(){
@@ -25284,7 +25216,7 @@ enifed("ember-routing/system/route",
         `model` objects should be loaded and associated with the rendered template.
 
 
-        ```js
+        ```javascript
         // posts route
         Ember.Route.extend({
           renderTemplate: function(controller, model){
@@ -25306,19 +25238,19 @@ enifed("ember-routing/system/route",
 
         Not all options need to be passed to `render`. Default values will be used
         based on the name of the route specified in the router or the Route's
-        `controllerName`, `viewName` and and `templateName` properties.
+        `controllerName`, `viewName` and `templateName` properties.
 
         For example:
 
-        ```js
+        ```javascript
         // router
         Router.map(function() {
           this.route('index');
-          this.resource('post', {path: '/posts/:post_id'});
+          this.resource('post', { path: '/posts/:post_id' });
         });
         ```
 
-        ```js
+        ```javascript
         // post route
         PostRoute = App.Route.extend({
           renderTemplate: function() {
@@ -25332,7 +25264,7 @@ enifed("ember-routing/system/route",
         The following equivalent default options will be applied when
         the Route calls `render`:
 
-        ```js
+        ```javascript
         //
         this.render('post', {  // the template name associated with 'post' Route
           into: 'application', // the parent route to 'post' Route
@@ -25417,7 +25349,7 @@ enifed("ember-routing/system/route",
 
         Example:
 
-        ```js
+        ```javascript
         App.ApplicationRoute = App.Route.extend({
           actions: {
             showModal: function(evt) {
@@ -25440,7 +25372,7 @@ enifed("ember-routing/system/route",
 
         Example:
 
-        ```js
+        ```javascript
         hideModal: function(evt) {
           this.disconnectOutlet('modal');
         }
@@ -25487,6 +25419,12 @@ enifed("ember-routing/system/route",
       }
     });
 
+    
+      // TODO add mixin directly to `Route` class definition above, once this
+      // feature is merged:
+      Route.reopen(Evented);
+    
+
     var defaultQPMeta = {
       qps: [],
       map: {},
@@ -25532,7 +25470,6 @@ enifed("ember-routing/system/route",
 
       var controller = options.controller;
       var model = options.model;
-      var namedController;
 
       if (options.controller) {
         controller = options.controller;
@@ -25604,11 +25541,15 @@ enifed("ember-routing/system/route",
     }
 
     function generateTopLevelTeardown(view) {
-      return function() { view.destroy(); };
+      return function() {
+        view.destroy();
+      };
     }
 
     function generateOutletTeardown(parentView, outlet) {
-      return function() { parentView.disconnectOutlet(outlet); };
+      return function() {
+        parentView.disconnectOutlet(outlet);
+      };
     }
 
     function getFullQueryParams(router, state) {
@@ -25658,8 +25599,8 @@ 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__) {
+  ["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-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/utils","ember-metal/platform","router","router/transition","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // FEATURES, Logger, K, assert
@@ -25670,32 +25611,25 @@ enifed("ember-routing/system/router",
     var computed = __dependency6__.computed;
     var merge = __dependency7__["default"];
     var run = __dependency8__["default"];
-    var forEach = __dependency9__.forEach;
 
-    var fmt = __dependency10__.fmt;
-    var EmberObject = __dependency11__["default"];
-    var Evented = __dependency12__["default"];
-    var EmberRouterDSL = __dependency13__["default"];
-    var EmberView = __dependency14__["default"];
-    var EmberLocation = __dependency15__["default"];
-    var _MetamorphView = __dependency16__["default"];
-    var routeArgs = __dependency17__.routeArgs;
-    var getActiveTargetName = __dependency17__.getActiveTargetName;
-    var stashParamNames = __dependency17__.stashParamNames;
-    var create = __dependency18__.create;
+    var fmt = __dependency9__.fmt;
+    var EmberObject = __dependency10__["default"];
+    var Evented = __dependency11__["default"];
+    var EmberRouterDSL = __dependency12__["default"];
+    var EmberView = __dependency13__["default"];
+    var EmberLocation = __dependency14__["default"];
+    var _MetamorphView = __dependency15__["default"];
+    var routeArgs = __dependency16__.routeArgs;
+    var getActiveTargetName = __dependency16__.getActiveTargetName;
+    var stashParamNames = __dependency16__.stashParamNames;
+    var create = __dependency17__.create;
 
     /**
     @module ember
     @submodule ember-routing
     */
 
-    // // side effect of loading some Ember globals, for now
-    // requireModule("ember-handlebars");
-    // requireModule("ember-runtime");
-    // requireModule("ember-views");
-
-    var Router = requireModule("router")['default'];
-    var Transition = requireModule("router/transition").Transition;
+    var Router = __dependency18__["default"];
 
     var slice = [].slice;
 
@@ -25773,6 +25707,7 @@ enifed("ember-routing/system/router",
         var container = this.container;
         var self = this;
         var initialURL = get(this, 'initialURL');
+        var initialTransition;
 
         // Allow the Location class to cancel the router setup while it refreshes
         // the page
@@ -25792,8 +25727,10 @@ enifed("ember-routing/system/router",
         if (typeof initialURL === "undefined") {
           initialURL = location.getURL();
         }
-
-        this.handleURL(initialURL);
+        initialTransition = this.handleURL(initialURL);
+        if (initialTransition && initialTransition.error) {
+          throw initialTransition.error;
+        }
       },
 
       /**
@@ -25823,6 +25760,9 @@ enifed("ember-routing/system/router",
       },
 
       handleURL: function(url) {
+        // Until we have an ember-idiomatic way of accessing #hashes, we need to
+        // remove it because router.js doesn't know how to handle it.
+        url = url.split(/#(.+)?/)[0];
         return this._doURLTransition('handleURL', url);
       },
 
@@ -25951,7 +25891,9 @@ enifed("ember-routing/system/router",
         var rootURL = get(this, 'rootURL');
 
         if (rootURL && this.container && !this.container.has('-location-setting:root-url')) {
-          this.container.register('-location-setting:root-url', rootURL, { instantiate: false });
+          this.container.register('-location-setting:root-url', rootURL, {
+            instantiate: false
+          });
         }
 
         if ('string' === typeof location && this.container) {
@@ -25961,7 +25903,9 @@ enifed("ember-routing/system/router",
             location = set(this, 'location', resolvedLocation);
           } else {
             // Allow for deprecated registration of custom location API's
-            var options = {implementation: location};
+            var options = {
+              implementation: location
+            };
 
             location = set(this, 'location', EmberLocation.create(options));
           }
@@ -25981,7 +25925,8 @@ enifed("ember-routing/system/router",
       },
 
       _getHandlerFunction: function() {
-        var seen = {}, container = this.container;
+        var seen = create(null);
+        var container = this.container;
         var DefaultRoute = container.lookupFactory('route:basic');
         var self = this;
 
@@ -25989,7 +25934,9 @@ enifed("ember-routing/system/router",
           var routeName = 'route:' + name;
           var handler = container.lookup(routeName);
 
-          if (seen[name]) { return handler; }
+          if (seen[name]) {
+            return handler;
+          }
 
           seen[name] = true;
 
@@ -26111,7 +26058,8 @@ enifed("ember-routing/system/router",
           return this._qpCache[leafRouteName];
         }
 
-        var map = {}, qps = [], qpCache = this._qpCache[leafRouteName] = {
+        var map = {}, qps = [];
+        this._qpCache[leafRouteName] = {
           map: map,
           qps: qps
         };
@@ -26516,7 +26464,6 @@ enifed("ember-routing/system/router",
 
     function forEachQueryParam(router, targetRouteName, queryParams, callback) {
       var qpCache = router._queryParamsFor(targetRouteName);
-      var qps = qpCache.qps;
 
       for (var key in queryParams) {
         if (!queryParams.hasOwnProperty(key)) { continue; }
@@ -26531,9 +26478,62 @@ enifed("ember-routing/system/router",
 
     __exports__["default"] = EmberRouter;
   });
+enifed("ember-routing/utils",
+  ["ember-metal/utils","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var typeOf = __dependency1__.typeOf;
+
+    function routeArgs(targetRouteName, models, queryParams) {
+      var args = [];
+      if (typeOf(targetRouteName) === 'string') {
+        args.push('' + targetRouteName);
+      }
+      args.push.apply(args, models);
+      args.push({ queryParams: queryParams });
+      return args;
+    }
+
+    __exports__.routeArgs = routeArgs;function getActiveTargetName(router) {
+      var handlerInfos = router.activeTransition ?
+                         router.activeTransition.state.handlerInfos :
+                         router.state.handlerInfos;
+      return handlerInfos[handlerInfos.length - 1].name;
+    }
+
+    __exports__.getActiveTargetName = getActiveTargetName;function stashParamNames(router, handlerInfos) {
+      if (handlerInfos._namesStashed) { return; }
+
+      // This helper exists because router.js/route-recognizer.js awkwardly
+      // keeps separate a handlerInfo's list of parameter names depending
+      // on whether a URL transition or named transition is happening.
+      // Hopefully we can remove this in the future.
+      var targetRouteName = handlerInfos[handlerInfos.length-1].name;
+      var recogHandlers = router.router.recognizer.handlersFor(targetRouteName);
+      var dynamicParent = null;
+
+      for (var i = 0, len = handlerInfos.length; i < len; ++i) {
+        var handlerInfo = handlerInfos[i];
+        var names = recogHandlers[i].names;
+
+        if (names.length) {
+          dynamicParent = handlerInfo;
+        }
+
+        handlerInfo._names = names;
+
+        var route = handlerInfo.handler;
+        route._stashNames(handlerInfo, dynamicParent);
+      }
+
+      handlerInfos._namesStashed = true;
+    }
+
+    __exports__.stashParamNames = stashParamNames;
+  });
 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"],
-  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__) {
+  ["ember-metal","ember-runtime/core","ember-runtime/compare","ember-runtime/copy","ember-runtime/inject","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/tracked_array","ember-runtime/system/subarray","ember-runtime/system/container","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/system/service","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__, __dependency45__, __exports__) {
     "use strict";
     /**
     Ember Runtime
@@ -26548,13 +26548,13 @@ enifed("ember-runtime",
     var isEqual = __dependency2__.isEqual;
     var compare = __dependency3__["default"];
     var copy = __dependency4__["default"];
+    var inject = __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 Namespace = __dependency6__["default"];
+    var EmberObject = __dependency7__["default"];
+    var TrackedArray = __dependency8__["default"];
+    var SubArray = __dependency9__["default"];
+    var Container = __dependency10__["default"];
     var ArrayProxy = __dependency11__["default"];
     var ObjectProxy = __dependency12__["default"];
     var CoreObject = __dependency13__["default"];
@@ -26611,7 +26611,9 @@ enifed("ember-runtime",
     var Controller = __dependency40__["default"];
     var ControllerMixin = __dependency41__["default"];
 
-    var RSVP = __dependency42__["default"];
+    var Service = __dependency42__["default"];
+
+    var RSVP = __dependency43__["default"];
         // just for side effect of extending Ember.RSVP
       // just for side effect of extending String.prototype
     // just for side effect of extending Function.prototype
@@ -26622,6 +26624,7 @@ enifed("ember-runtime",
     Ember.copy = copy;
     Ember.isEqual = isEqual;
 
+    
     Ember.Array = EmberArray;
 
     Ember.Comparable = Comparable;
@@ -26693,6 +26696,7 @@ enifed("ember-runtime",
     Ember.Controller = Controller;
     Ember.ControllerMixin = ControllerMixin;
 
+    
     Ember._ProxyMixin = _ProxyMixin;
 
     Ember.RSVP = RSVP;
@@ -26819,7 +26823,6 @@ enifed("ember-runtime/computed/array_computed",
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
-    var reduceComputed = __dependency2__.reduceComputed;
     var ReduceComputedProperty = __dependency2__.ReduceComputedProperty;
     var forEach = __dependency3__.forEach;
     var o_create = __dependency4__.create;
@@ -27008,32 +27011,30 @@ enifed("ember-runtime/computed/array_computed",
     __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__) {
+  ["ember-metal/core","ember-metal/property_get","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__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert
     var e_get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var guidFor = __dependency4__.guidFor;
-    var metaFor = __dependency4__.meta;
-    var EmberError = __dependency5__["default"];
-    var propertyWillChange = __dependency6__.propertyWillChange;
-    var propertyDidChange = __dependency6__.propertyDidChange;
-    var expandProperties = __dependency7__["default"];
-    var addObserver = __dependency8__.addObserver;
-    var observersFor = __dependency8__.observersFor;
-    var removeObserver = __dependency8__.removeObserver;
-    var addBeforeObserver = __dependency8__.addBeforeObserver;
-    var removeBeforeObserver = __dependency8__.removeBeforeObserver;
-    var ComputedProperty = __dependency9__.ComputedProperty;
-    var cacheFor = __dependency9__.cacheFor;
-    var o_create = __dependency10__.create;
-    var forEach = __dependency11__.forEach;
-    var TrackedArray = __dependency12__["default"];
-    var EmberArray = __dependency13__["default"];
-    var run = __dependency14__["default"];
-    var isArray = __dependency4__.isArray;
+    var guidFor = __dependency3__.guidFor;
+    var metaFor = __dependency3__.meta;
+    var EmberError = __dependency4__["default"];
+    var propertyWillChange = __dependency5__.propertyWillChange;
+    var propertyDidChange = __dependency5__.propertyDidChange;
+    var expandProperties = __dependency6__["default"];
+    var addObserver = __dependency7__.addObserver;
+    var removeObserver = __dependency7__.removeObserver;
+    var addBeforeObserver = __dependency7__.addBeforeObserver;
+    var removeBeforeObserver = __dependency7__.removeBeforeObserver;
+    var ComputedProperty = __dependency8__.ComputedProperty;
+    var cacheFor = __dependency8__.cacheFor;
+    var o_create = __dependency9__.create;
+    var forEach = __dependency10__.forEach;
+    var TrackedArray = __dependency11__["default"];
+    var EmberArray = __dependency12__["default"];
+    var run = __dependency13__["default"];
+    var isArray = __dependency3__.isArray;
 
     var cacheSet = cacheFor.set;
     var cacheGet = cacheFor.get;
@@ -27402,7 +27403,6 @@ enifed("ember-runtime/computed/reduce_computed",
     }
 
     function reset(cp, propertyName) {
-      var callbacks = cp._callbacks();
       var hadMeta = cp._hasInstanceMeta(this, propertyName);
       var meta = cp._instanceMeta(this, propertyName);
 
@@ -27502,7 +27502,6 @@ enifed("ember-runtime/computed/reduce_computed",
       };
 
       var recompute = function(propertyName) {
-        var dependentKeys = cp._dependentKeys;
         var meta = cp._instanceMeta(this, propertyName);
         var callbacks = cp._callbacks();
 
@@ -27629,7 +27628,7 @@ enifed("ember-runtime/computed/reduce_computed",
       var cp = this;
       var args = a_slice.call(arguments);
       var propertyArgs = {};
-      var match, dependentArrayKey, itemPropertyKey;
+      var match, dependentArrayKey;
 
       forEach(args, function (dependentKey) {
         if (doubleEachPropertyPattern.test(dependentKey)) {
@@ -27870,8 +27869,8 @@ 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__) {
+  ["ember-metal/core","ember-metal/property_get","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__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -27881,18 +27880,17 @@ 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 isArray = __dependency3__.isArray;
+    var guidFor = __dependency3__.guidFor;
+    var EmberError = __dependency4__["default"];
+    var forEach = __dependency5__.forEach;
+    var run = __dependency6__["default"];
+    var addObserver = __dependency7__.addObserver;
+    var arrayComputed = __dependency8__.arrayComputed;
+    var reduceComputed = __dependency9__.reduceComputed;
+    var SubArray = __dependency10__["default"];
+    var keys = __dependency11__["default"];
+    var compare = __dependency12__["default"];
 
     var a_slice = [].slice;
 
@@ -28359,7 +28357,6 @@ enifed("ember-runtime/computed/reduce_computed_macros",
         removedItem: function(array, item, changeMeta, instanceMeta) {
           var itemGuid = guidFor(item);
           var dependentGuid = guidFor(changeMeta.arrayChanged);
-          var numberOfDependentArrays = changeMeta.property._dependentKeys.length;
           var numberOfArraysItemAppearsIn;
           var itemCounts = instanceMeta.itemCounts;
 
@@ -28713,8 +28710,8 @@ enifed("ember-runtime/computed/reduce_computed_macros",
     }
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/property_get","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__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -28723,14 +28720,13 @@ enifed("ember-runtime/controllers/array_controller",
 
     var Ember = __dependency1__["default"];
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var forEach = __dependency4__.forEach;
-    var replace = __dependency4__.replace;
-    var ArrayProxy = __dependency5__["default"];
-    var SortableMixin = __dependency6__["default"];
-    var ControllerMixin = __dependency7__["default"];
-    var computed = __dependency8__.computed;
-    var EmberError = __dependency9__["default"];
+    var forEach = __dependency3__.forEach;
+    var replace = __dependency3__.replace;
+    var ArrayProxy = __dependency4__["default"];
+    var SortableMixin = __dependency5__["default"];
+    var ControllerMixin = __dependency6__["default"];
+    var computed = __dependency7__.computed;
+    var EmberError = __dependency8__["default"];
 
 
     /**
@@ -28756,8 +28752,8 @@ enifed("ember-runtime/controllers/array_controller",
       Then, create a view that binds to your new controller:
 
       ```handlebars
-      {{#each MyApp.listController}}
-        {{firstName}} {{lastName}}
+      {{#each person in MyApp.listController}}
+        {{person.firstName}} {{person.lastName}}
       {{/each}}
       ```
 
@@ -29002,11 +28998,14 @@ enifed("ember-runtime/controllers/array_controller",
     });
   });
 enifed("ember-runtime/controllers/controller",
-  ["ember-runtime/system/object","ember-runtime/mixins/controller","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+  ["ember-metal/core","ember-runtime/system/object","ember-runtime/mixins/controller","ember-runtime/inject","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
-    var EmberObject = __dependency1__["default"];
-    var Mixin = __dependency2__["default"];
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var EmberObject = __dependency2__["default"];
+    var Mixin = __dependency3__["default"];
+    var createInjectionHelper = __dependency4__.createInjectionHelper;
 
     /**
     @module ember
@@ -29019,7 +29018,15 @@ enifed("ember-runtime/controllers/controller",
       @extends Ember.Object
       @uses Ember.ControllerMixin
     */
-    __exports__["default"] = EmberObject.extend(Mixin);
+    var Controller = EmberObject.extend(Mixin);
+
+    function controllerInjectionHelper(factory) {
+      Ember.assert("Defining an injected controller property on a " +
+                   "non-controller is not allowed.", Controller.detect(factory));
+    }
+
+    
+    __exports__["default"] = Controller;
   });
 enifed("ember-runtime/controllers/object_controller",
   ["ember-runtime/mixins/controller","ember-runtime/system/object_proxy","exports"],
@@ -29121,8 +29128,9 @@ enifed("ember-runtime/copy",
       any type of object and create a clone of it, including primitive values
       (which are not actually cloned because they are immutable).
 
-      If the passed object implements the `clone()` method, then this function
-      will simply call that method and return the result.
+      If the passed object implements the `copy()` method, then this function
+      will simply call that method and return the result. Please see
+      `Ember.Copyable` for further details.
 
       @method copy
       @for Ember
@@ -29405,8 +29413,8 @@ enifed("ember-runtime/ext/function",
     }
   });
 enifed("ember-runtime/ext/rsvp",
-  ["ember-metal/core","ember-metal/logger","ember-metal/run_loop","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/core","ember-metal/logger","ember-metal/run_loop","rsvp","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /* globals RSVP:true */
 
@@ -29414,7 +29422,12 @@ enifed("ember-runtime/ext/rsvp",
     var Logger = __dependency2__["default"];
     var run = __dependency3__["default"];
 
-    var RSVP = requireModule('rsvp');
+    // this is technically incorrect (per @wycats)
+    // it should be `import * as RSVP from 'rsvp';` but
+    // Esprima does not support this syntax yet (and neither does
+    // es6-module-transpiler 0.4.0 - 0.6.2).
+    var RSVP = __dependency4__;
+
     var testModuleName = 'ember-testing/test';
     var Test;
 
@@ -29447,7 +29460,7 @@ enifed("ember-runtime/ext/rsvp",
     };
 
     RSVP.onerrorDefault = function (error) {
-      if (error instanceof Error) {
+      if (error && error.name !== 'TransitionAborted') {
         if (Ember.testing) {
           // ES6TODO: remove when possible
           if (!Test && Ember.__loader.registry[testModuleName]) {
@@ -29456,6 +29469,7 @@ enifed("ember-runtime/ext/rsvp",
 
           if (Test && Test.adapter) {
             Test.adapter.exception(error);
+            Logger.error(error.stack);
           } else {
             throw error;
           }
@@ -29588,9 +29602,93 @@ enifed("ember-runtime/ext/string",
       };
     }
   });
+enifed("ember-runtime/inject",
+  ["ember-metal/core","ember-metal/enumerable_utils","ember-metal/injected_property","ember-metal/keys","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var indexOf = __dependency2__.indexOf;
+    var InjectedProperty = __dependency3__["default"];
+    var keys = __dependency4__["default"];
+
+    /**
+      Namespace for injection helper methods.
+
+      @class inject
+      @namespace Ember
+      */
+    function inject() {
+      Ember.assert("Injected properties must be created through helpers, see `" +
+                   keys(inject).join("`, `") + "`");
+    }
+
+    // Dictionary of injection validations by type, added to by `createInjectionHelper`
+    var typeValidators = {};
+
+    /**
+      This method allows other Ember modules to register injection helpers for a
+      given container type. Helpers are exported to the `inject` namespace as the
+      container type itself.
+
+      @private
+      @method createInjectionHelper
+      @namespace Ember
+      @param {String} type The container type the helper will inject
+      @param {Function} validator A validation callback that is executed at mixin-time
+    */
+    function createInjectionHelper(type, validator) {
+      typeValidators[type] = validator;
+
+      inject[type] = function(name) {
+        return new InjectedProperty(type, name);
+      };
+    }
+
+    __exports__.createInjectionHelper = createInjectionHelper;/**
+      Validation function intended to be invoked at when extending a factory with
+      injected properties. Runs per-type validation functions once for each injected
+      type encountered.
+
+      Note that this currently modifies the mixin themselves, which is technically
+      dubious but is practically of little consequence. This may change in the
+      future.
+
+      @private
+      @method validatePropertyInjections
+      @namespace Ember
+      @param {Object} factory The factory object being extended
+      @param {Object} props A hash of properties to be added to the factory
+    */
+    function validatePropertyInjections(factory, props) {
+      var types = [];
+      var key, desc, validator, i, l;
+
+      for (key in props) {
+        desc = props[key];
+        if (desc instanceof InjectedProperty && indexOf(types, desc.type) === -1) {
+          types.push(desc.type);
+        }
+      }
+
+      if (types.length) {
+        for (i = 0, l = types.length; i < l; i++) {
+          validator = typeValidators[types[i]];
+
+          if (typeof validator === 'function') {
+            validator(factory);
+          }
+        }
+      }
+
+      return true;
+    }
+
+    __exports__.validatePropertyInjections = validatePropertyInjections;__exports__["default"] = inject;
+  });
 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__) {
+  ["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","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -29613,7 +29711,6 @@ enifed("ember-runtime/mixins/-proxy",
     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."
@@ -29680,7 +29777,8 @@ enifed("ember-runtime/mixins/-proxy",
         }
 
         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);
+        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);
       }
 
@@ -29846,6 +29944,7 @@ enifed("ember-runtime/mixins/action_handler",
         @method willMergeMixin
       */
       willMergeMixin: function(props) {
+        
         var hashName;
 
         if (!props._actions) {
@@ -29854,7 +29953,8 @@ enifed("ember-runtime/mixins/action_handler",
           if (typeOf(props.actions) === 'object') {
             hashName = 'actions';
           } else if (typeOf(props.events) === 'object') {
-            Ember.deprecate('Action handlers contained in an `events` object are deprecated in favor of putting them in an `actions` object', false);
+            Ember.deprecate('Action handlers contained in an `events` object are deprecated in favor' +
+                            ' of putting them in an `actions` object', false);
             hashName = 'events';
           }
 
@@ -29908,7 +30008,8 @@ enifed("ember-runtime/mixins/action_handler",
         }
 
         if (target = get(this, 'target')) {
-          Ember.assert("The `target` for " + this + " (" + target + ") does not have a `send` method", typeof target.send === 'function');
+          Ember.assert("The `target` for " + this + " (" + target +
+                       ") does not have a `send` method", typeof target.send === 'function');
           target.send.apply(target, arguments);
         }
       }
@@ -29930,11 +30031,11 @@ 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 isNone = __dependency4__["default"];
     var Enumerable = __dependency5__["default"];
     var map = __dependency6__.map;
     var Mixin = __dependency7__.Mixin;
@@ -30480,17 +30581,13 @@ enifed("ember-runtime/mixins/comparable",
     });
   });
 enifed("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__) {
+  ["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__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    // Ember.assert, Ember.deprecate
-    var get = __dependency2__.get;
-    var EmberObject = __dependency3__["default"];
-    var Mixin = __dependency4__.Mixin;
-    var computed = __dependency5__.computed;
-    var ActionHandler = __dependency6__["default"];
-    var ControllerContentModelAliasDeprecation = __dependency7__["default"];
+    var Mixin = __dependency1__.Mixin;
+    var computed = __dependency2__.computed;
+    var ActionHandler = __dependency3__["default"];
+    var ControllerContentModelAliasDeprecation = __dependency4__["default"];
 
     /**
       `Ember.ControllerMixin` provides a standard interface for all classes that
@@ -30548,13 +30645,12 @@ enifed("ember-runtime/mixins/controller",
     });
   });
 enifed("ember-runtime/mixins/controller_content_model_alias_deprecation",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/core","ember-metal/mixin","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.deprecate
-    var get = __dependency2__.get;
-    var Mixin = __dependency3__.Mixin;
+    var Mixin = __dependency2__.Mixin;
 
     /**
       The ControllerContentModelAliasDeprecation mixin is used to provide a useful
@@ -30607,8 +30703,8 @@ enifed("ember-runtime/mixins/controller_content_model_alias_deprecation",
     });
   });
 enifed("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__) {
+  ["ember-metal/property_get","ember-metal/mixin","ember-runtime/mixins/freezable","ember-runtime/system/string","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -30617,12 +30713,11 @@ enifed("ember-runtime/mixins/copyable",
 
 
     var get = __dependency1__.get;
-    var set = __dependency2__.set;
-    var required = __dependency3__.required;
-    var Freezable = __dependency4__.Freezable;
-    var Mixin = __dependency3__.Mixin;
-    var fmt = __dependency5__.fmt;
-    var EmberError = __dependency6__["default"];
+    var required = __dependency2__.required;
+    var Freezable = __dependency3__.Freezable;
+    var Mixin = __dependency2__.Mixin;
+    var fmt = __dependency4__.fmt;
+    var EmberError = __dependency5__["default"];
 
 
     /**
@@ -30790,7 +30885,7 @@ enifed("ember-runtime/mixins/enumerable",
     var contexts = [];
 
     function popCtx() {
-      return contexts.length===0 ? {} : contexts.pop();
+      return contexts.length === 0 ? {} : contexts.pop();
     }
 
     function pushCtx(ctx) {
@@ -30803,7 +30898,7 @@ enifed("ember-runtime/mixins/enumerable",
 
       function i(item) {
         var cur = get(item, key);
-        return valueProvided ? value===cur : !!cur;
+        return valueProvided ? value === cur : !!cur;
       }
 
       return i;
@@ -30894,8 +30989,8 @@ enifed("ember-runtime/mixins/enumerable",
         If your enumerable is empty, this method should return `undefined`.
 
         ```javascript
-        var arr = ["a", "b", "c"];
-        arr.get('firstObject');  // "a"
+        var arr = ['a', 'b', 'c'];
+        arr.get('firstObject');  // 'a'
 
         var arr = [];
         arr.get('firstObject');  // undefined
@@ -30905,12 +31000,16 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Object} the object or undefined
       */
       firstObject: computed('[]', function() {
-        if (get(this, 'length')===0) return undefined ;
+        if (get(this, 'length') === 0) {
+          return undefined;
+        }
 
         // handle generic enumerables
-        var context = popCtx(), ret;
-        ret = this.nextObject(0, null, context);
+        var context = popCtx();
+        var ret = this.nextObject(0, null, context);
+
         pushCtx(context);
+
         return ret;
       }),
 
@@ -30920,8 +31019,8 @@ enifed("ember-runtime/mixins/enumerable",
         If your enumerable is empty, this method should return `undefined`.
 
         ```javascript
-        var arr = ["a", "b", "c"];
-        arr.get('lastObject');  // "c"
+        var arr = ['a', 'b', 'c'];
+        arr.get('lastObject');  // 'c'
 
         var arr = [];
         arr.get('lastObject');  // undefined
@@ -30932,13 +31031,23 @@ enifed("ember-runtime/mixins/enumerable",
       */
       lastObject: computed('[]', function() {
         var len = get(this, 'length');
-        if (len===0) return undefined ;
-        var context = popCtx(), idx=0, cur, last = null;
+
+        if (len === 0) {
+          return undefined;
+        }
+
+        var context = popCtx();
+        var idx = 0;
+        var last = null;
+        var cur;
+
         do {
           last = cur;
           cur = this.nextObject(idx++, last, context);
         } while (cur !== undefined);
+
         pushCtx(context);
+
         return last;
       }),
 
@@ -30948,9 +31057,10 @@ enifed("ember-runtime/mixins/enumerable",
         is found. You may want to override this with a more efficient version.
 
         ```javascript
-        var arr = ["a", "b", "c"];
-        arr.contains("a"); // true
-        arr.contains("z"); // false
+        var arr = ['a', 'b', 'c'];
+
+        arr.contains('a'); // true
+        arr.contains('z'); // false
         ```
 
         @method contains
@@ -30958,7 +31068,11 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Boolean} `true` if object is found in enumerable.
       */
       contains: function(obj) {
-        return this.find(function(item) { return item===obj; }) !== undefined;
+        var found = this.find(function(item) {
+          return item === obj;
+        });
+        
+        return found !== undefined;
       },
 
       /**
@@ -30987,18 +31101,27 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Object} receiver
       */
       forEach: function(callback, target) {
-        if (typeof callback !== 'function') throw new TypeError() ;
-        var len = get(this, 'length'), last = null, context = popCtx();
+        if (typeof callback !== 'function') {
+          throw new TypeError();
+        }
 
-        if (target === undefined) target = null;
+        var context = popCtx();
+        var len = get(this, 'length');
+        var last = null;
 
-        for(var idx=0;idx<len;idx++) {
+        if (target === undefined) {
+          target = null;
+        }
+
+        for(var idx = 0; idx < len; idx++) {
           var next = this.nextObject(idx, last, context) ;
           callback.call(target, next, idx, this);
           last = next ;
         }
+
         last = null ;
         context = pushCtx(context);
+
         return this ;
       },
 
@@ -31058,9 +31181,11 @@ enifed("ember-runtime/mixins/enumerable",
       */
       map: function(callback, target) {
         var ret = Ember.A();
+
         this.forEach(function(x, idx, i) {
           ret[idx] = callback.call(target, x, idx,i);
         });
+
         return ret ;
       },
 
@@ -31120,9 +31245,13 @@ enifed("ember-runtime/mixins/enumerable",
       */
       filter: function(callback, target) {
         var ret = Ember.A();
+
         this.forEach(function(x, idx, i) {
-          if (callback.call(target, x, idx, i)) ret.push(x);
+          if (callback.call(target, x, idx, i)) {
+            ret.push(x);
+          }
         });
+
         return ret ;
       },
 
@@ -31196,8 +31325,14 @@ 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 exactValue = function(item) {
+          return get(item, key) === value;
+        };
+
+        var hasValue = function(item) {
+          return !!get(item, key);
+        };
+
         var use = (arguments.length === 2 ? exactValue : hasValue);
 
         return this.reject(use);
@@ -31245,19 +31380,31 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Object} Found item or `undefined`.
       */
       find: function(callback, target) {
-        var len = get(this, 'length') ;
-        if (target === undefined) target = null;
+        var len = get(this, 'length');
 
-        var last = null, next, found = false, ret ;
-        var context = popCtx();
-        for(var idx=0;idx<len && !found;idx++) {
-          next = this.nextObject(idx, last, context) ;
-          if (found = callback.call(target, next, idx, this)) ret = next ;
-          last = next ;
+        if (target === undefined) {
+          target = null;
         }
-        next = last = null ;
+
+        var context = popCtx();
+        var found = false;
+        var last = null;
+        var next, ret;
+
+        for(var idx = 0; idx < len && !found; idx++) {
+          next = this.nextObject(idx, last, context);
+
+          if (found = callback.call(target, next, idx, this)) {
+            ret = next;
+          }
+
+          last = next;
+        }
+
+        next = last = null;
         context = pushCtx(context);
-        return ret ;
+
+        return ret;
       },
 
       /**
@@ -31315,7 +31462,9 @@ enifed("ember-runtime/mixins/enumerable",
         Example Usage:
 
         ```javascript
-        if (people.every(isEngineer)) { Paychecks.addBigBonus(); }
+        if (people.every(isEngineer)) {
+          Paychecks.addBigBonus();
+        }
         ```
 
         @method every
@@ -31386,7 +31535,9 @@ enifed("ember-runtime/mixins/enumerable",
         Usage Example:
 
         ```javascript
-        if (people.any(isManager)) { Paychecks.addBiggerBonus(); }
+        if (people.any(isManager)) {
+          Paychecks.addBiggerBonus();
+        }
         ```
 
         @method any
@@ -31395,13 +31546,15 @@ 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 len = get(this, 'length');
         var context = popCtx();
-        var found   = false;
-        var last    = null;
+        var found = false;
+        var last = null;
         var next, idx;
 
-        if (target === undefined) { target = null; }
+        if (target === undefined) {
+          target = null;
+        }
 
         for (idx = 0; idx < len && !found; idx++) {
           next  = this.nextObject(idx, last, context);
@@ -31439,7 +31592,9 @@ enifed("ember-runtime/mixins/enumerable",
         Usage Example:
 
         ```javascript
-        if (people.some(isManager)) { Paychecks.addBiggerBonus(); }
+        if (people.some(isManager)) {
+          Paychecks.addBiggerBonus();
+        }
         ```
 
         @method some
@@ -31516,7 +31671,9 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Object} The reduced value.
       */
       reduce: function(callback, initialValue, reducerProperty) {
-        if (typeof callback !== "function") { throw new TypeError(); }
+        if (typeof callback !== 'function') {
+          throw new TypeError();
+        }
 
         var ret = initialValue;
 
@@ -31538,11 +31695,16 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Array} return values from calling invoke.
       */
       invoke: function(methodName) {
-        var args, ret = Ember.A();
-        if (arguments.length>1) args = a_slice.call(arguments, 1);
+        var ret = Ember.A();
+        var args;
+
+        if (arguments.length > 1) {
+          args = a_slice.call(arguments, 1);
+        }
 
         this.forEach(function(x, idx) {
           var method = x && x[methodName];
+
           if ('function' === typeof method) {
             ret[idx] = args ? apply(x, method, args) : x[methodName]();
           }
@@ -31560,23 +31722,29 @@ enifed("ember-runtime/mixins/enumerable",
       */
       toArray: function() {
         var ret = Ember.A();
-        this.forEach(function(o, idx) { ret[idx] = o; });
+
+        this.forEach(function(o, idx) {
+          ret[idx] = o;
+        });
+
         return ret;
       },
 
       /**
-        Returns a copy of the array with all null and undefined elements removed.
+        Returns a copy of the array with all `null` and `undefined` elements removed.
 
         ```javascript
-        var arr = ["a", null, "c", undefined];
-        arr.compact();  // ["a", "c"]
+        var arr = ['a', null, 'c', undefined];
+        arr.compact();  // ['a', 'c']
         ```
 
         @method compact
         @return {Array} the array without null and undefined elements.
       */
       compact: function() {
-        return this.filter(function(value) { return value != null; });
+        return this.filter(function(value) {
+          return value != null;
+        });
       },
 
       /**
@@ -31585,8 +31753,8 @@ enifed("ember-runtime/mixins/enumerable",
         the receiver does not contain the value.
 
         ```javascript
-        var arr = ["a", "b", "a", "c"];
-        arr.without("a");  // ["b", "c"]
+        var arr = ['a', 'b', 'a', 'c'];
+        arr.without('a');  // ['b', 'c']
         ```
 
         @method without
@@ -31594,12 +31762,19 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Ember.Enumerable}
       */
       without: function(value) {
-        if (!this.contains(value)) return this; // nothing to do
+        if (!this.contains(value)) {
+          return this; // nothing to do
+        }
+
         var ret = Ember.A();
+
         this.forEach(function(k) {
-          if (k !== value) ret[ret.length] = k;
-        }) ;
-        return ret ;
+          if (k !== value) {
+            ret[ret.length] = k;
+          }
+        });
+
+        return ret;
       },
 
       /**
@@ -31607,18 +31782,24 @@ enifed("ember-runtime/mixins/enumerable",
         implementation returns an array regardless of the receiver type.
 
         ```javascript
-        var arr = ["a", "a", "b", "b"];
-        arr.uniq();  // ["a", "b"]
+        var arr = ['a', 'a', 'b', 'b'];
+        arr.uniq();  // ['a', 'b']
         ```
 
+        This only works on primitive data types, e.g. Strings, Numbers, etc.
+
         @method uniq
         @return {Ember.Enumerable}
       */
       uniq: function() {
         var ret = Ember.A();
+
         this.forEach(function(k) {
-          if (indexOf(ret, k)<0) ret.push(k);
+          if (indexOf(ret, k) < 0) {
+            ret.push(k);
+          }
         });
+
         return ret;
       },
 
@@ -31656,10 +31837,17 @@ enifed("ember-runtime/mixins/enumerable",
         var didChange  = (opts && opts.didChange) || 'enumerableDidChange';
         var hasObservers = get(this, 'hasEnumerableObservers');
 
-        if (!hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
+        if (!hasObservers) { 
+          propertyWillChange(this, 'hasEnumerableObservers');
+        }
+
         addListener(this, '@enumerable:before', target, willChange);
         addListener(this, '@enumerable:change', target, didChange);
-        if (!hasObservers) propertyDidChange(this, 'hasEnumerableObservers');
+
+        if (!hasObservers) {
+          propertyDidChange(this, 'hasEnumerableObservers');
+        }
+
         return this;
       },
 
@@ -31674,12 +31862,19 @@ enifed("ember-runtime/mixins/enumerable",
       removeEnumerableObserver: function(target, opts) {
         var willChange = (opts && opts.willChange) || 'enumerableWillChange';
         var didChange  = (opts && opts.didChange) || 'enumerableDidChange';
-
         var hasObservers = get(this, 'hasEnumerableObservers');
-        if (hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
+
+        if (hasObservers) {
+          propertyWillChange(this, 'hasEnumerableObservers');
+        }
+
         removeListener(this, '@enumerable:before', target, willChange);
         removeListener(this, '@enumerable:change', target, didChange);
-        if (hasObservers) propertyDidChange(this, 'hasEnumerableObservers');
+
+        if (hasObservers) {
+          propertyDidChange(this, 'hasEnumerableObservers');
+        }
+
         return this;
       },
 
@@ -31708,24 +31903,40 @@ enifed("ember-runtime/mixins/enumerable",
         @chainable
       */
       enumerableContentWillChange: function(removing, adding) {
-
         var removeCnt, addCnt, hasDelta;
 
-        if ('number' === typeof removing) removeCnt = removing;
-        else if (removing) removeCnt = get(removing, 'length');
-        else removeCnt = removing = -1;
+        if ('number' === typeof removing) {
+          removeCnt = removing;
+        } else if (removing) {
+          removeCnt = get(removing, 'length');
+        } else {
+          removeCnt = removing = -1;
+        }
 
-        if ('number' === typeof adding) addCnt = adding;
-        else if (adding) addCnt = get(adding,'length');
-        else addCnt = adding = -1;
+        if ('number' === typeof adding) {
+          addCnt = adding;
+        } else if (adding) {
+          addCnt = get(adding,'length');
+        } else {
+          addCnt = adding = -1;
+        }
 
-        hasDelta = addCnt<0 || removeCnt<0 || addCnt-removeCnt!==0;
+        hasDelta = addCnt < 0 || removeCnt < 0 || addCnt - removeCnt !== 0;
 
-        if (removing === -1) removing = null;
-        if (adding   === -1) adding   = null;
+        if (removing === -1) {
+          removing = null;
+        }
+
+        if (adding === -1) {
+          adding = null;
+        }
 
         propertyWillChange(this, '[]');
-        if (hasDelta) propertyWillChange(this, 'length');
+
+        if (hasDelta) {
+          propertyWillChange(this, 'length');
+        }
+
         sendEvent(this, '@enumerable:before', [this, removing, adding]);
 
         return this;
@@ -31748,21 +31959,38 @@ enifed("ember-runtime/mixins/enumerable",
       enumerableContentDidChange: function(removing, adding) {
         var removeCnt, addCnt, hasDelta;
 
-        if ('number' === typeof removing) removeCnt = removing;
-        else if (removing) removeCnt = get(removing, 'length');
-        else removeCnt = removing = -1;
+        if ('number' === typeof removing) {
+          removeCnt = removing;
+        } else if (removing) {
+          removeCnt = get(removing, 'length');
+        } else {
+          removeCnt = removing = -1;
+        }
 
-        if ('number' === typeof adding) addCnt = adding;
-        else if (adding) addCnt = get(adding, 'length');
-        else addCnt = adding = -1;
+        if ('number' === typeof adding) {
+          addCnt = adding;
+        } else if (adding) {
+          addCnt = get(adding, 'length');
+        } else {
+          addCnt = adding = -1;
+        }
 
-        hasDelta = addCnt<0 || removeCnt<0 || addCnt-removeCnt!==0;
+        hasDelta = addCnt < 0 || removeCnt < 0 || addCnt - removeCnt !== 0;
 
-        if (removing === -1) removing = null;
-        if (adding   === -1) adding   = null;
+        if (removing === -1) {
+          removing = null;
+        }
+
+        if (adding === -1) {
+          adding = null;
+        }
 
         sendEvent(this, '@enumerable:change', [this, removing, adding]);
-        if (hasDelta) propertyDidChange(this, 'length');
+
+        if (hasDelta) {
+          propertyDidChange(this, 'length');
+        }
+
         propertyDidChange(this, '[]');
 
         return this ;
@@ -31781,6 +32009,7 @@ enifed("ember-runtime/mixins/enumerable",
         */
       sortBy: function() {
         var sortKeys = arguments;
+
         return this.toArray().sort(function(a, b){
           for(var i = 0; i < sortKeys.length; i++) {
             var key = sortKeys[i];
@@ -31788,7 +32017,10 @@ enifed("ember-runtime/mixins/enumerable",
             var propB = get(b, key);
             // return 1 or -1 else continue to the next sortKey
             var compareValue = compare(propA, propB);
-            if (compareValue) { return compareValue; }
+
+            if (compareValue) {
+              return compareValue;
+            }
           }
           return 0;
         });
@@ -32051,8 +32283,8 @@ enifed("ember-runtime/mixins/freezable",
     __exports__.FROZEN_ERROR = FROZEN_ERROR;
   });
 enifed("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__) {
+  ["ember-metal/property_get","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__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -32075,14 +32307,13 @@ enifed("ember-runtime/mixins/mutable_array",
     //
 
     var get = __dependency1__.get;
-    var set = __dependency2__.set;
-    var isArray = __dependency3__.isArray;
-    var EmberError = __dependency4__["default"];
-    var Mixin = __dependency5__.Mixin;
-    var required = __dependency5__.required;
-    var EmberArray = __dependency6__["default"];
-    var MutableEnumerable = __dependency7__["default"];
-    var Enumerable = __dependency8__["default"];
+    var isArray = __dependency2__.isArray;
+    var EmberError = __dependency3__["default"];
+    var Mixin = __dependency4__.Mixin;
+    var required = __dependency4__.required;
+    var EmberArray = __dependency5__["default"];
+    var MutableEnumerable = __dependency6__["default"];
+    var Enumerable = __dependency7__["default"];
     /**
       This mixin defines the API for modifying array-like objects. These methods
       can be applied only to a collection that keeps its items in an ordered set.
@@ -32361,7 +32592,7 @@ enifed("ember-runtime/mixins/mutable_array",
       //
 
       /**
-        Remove all occurances of an object in the array.
+        Remove all occurrences of an object in the array.
 
         ```javascript
         var cities = ["Chicago", "Berlin", "Lima", "Chicago"];
@@ -32553,7 +32784,7 @@ enifed("ember-runtime/mixins/observable",
     var removeObserver = __dependency10__.removeObserver;
     var observersFor = __dependency10__.observersFor;
     var cacheFor = __dependency11__.cacheFor;
-    var isNone = __dependency12__.isNone;
+    var isNone = __dependency12__["default"];
 
 
     var slice = Array.prototype.slice;
@@ -33250,8 +33481,8 @@ enifed("ember-runtime/mixins/promise_proxy",
     }
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/property_get","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__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -33262,23 +33493,22 @@ enifed("ember-runtime/mixins/sortable",
     // Ember.assert, Ember.A
 
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var forEach = __dependency4__.forEach;
-    var Mixin = __dependency5__.Mixin;
-    var MutableEnumerable = __dependency6__["default"];
-    var compare = __dependency7__["default"];
-    var addObserver = __dependency8__.addObserver;
-    var removeObserver = __dependency8__.removeObserver;
-    var computed = __dependency9__.computed;
-    var beforeObserver = __dependency5__.beforeObserver;
-    var observer = __dependency5__.observer;
-    //ES6TODO: should we access these directly from their package or from how thier exposed in ember-metal?
+    var forEach = __dependency3__.forEach;
+    var Mixin = __dependency4__.Mixin;
+    var MutableEnumerable = __dependency5__["default"];
+    var compare = __dependency6__["default"];
+    var addObserver = __dependency7__.addObserver;
+    var removeObserver = __dependency7__.removeObserver;
+    var computed = __dependency8__.computed;
+    var beforeObserver = __dependency4__.beforeObserver;
+    var observer = __dependency4__.observer;
+    //ES6TODO: should we access these directly from their package or from how their exposed in ember-metal?
 
     /**
       `Ember.SortableMixin` provides a standard interface for array proxies
       to specify a sort order and maintain this sorting when objects are added,
       removed, or updated without changing the implicit order of their underlying
-      modelarray:
+      model array:
 
       ```javascript
       songs = [
@@ -33310,8 +33540,8 @@ enifed("ember-runtime/mixins/sortable",
       songsController.get('firstObject'); // {trackNumber: 4, title: 'Ob-La-Di, Ob-La-Da'}
       ```
 
-      SortableMixin works by sorting the arrangedContent array, which is the array that
-      arrayProxy displays. Due to the fact that the underlying 'content' array is not changed, that
+      `SortableMixin` works by sorting the `arrangedContent` array, which is the array that
+      `ArrayProxy` displays. Due to the fact that the underlying 'content' array is not changed, that
       array will not display the sorted list:
 
        ```javascript
@@ -33319,8 +33549,8 @@ enifed("ember-runtime/mixins/sortable",
       songsController.get('firstObject'); // Returns the sorted content.
       ```
 
-      Although the sorted content can also be accessed through the arrangedContent property,
-      it is preferable to use the proxied class and not the arrangedContent array directly.
+      Although the sorted content can also be accessed through the `arrangedContent` property,
+      it is preferable to use the proxied class and not the `arrangedContent` array directly.
 
       @class SortableMixin
       @namespace Ember
@@ -33329,7 +33559,7 @@ enifed("ember-runtime/mixins/sortable",
     __exports__["default"] = Mixin.create(MutableEnumerable, {
 
       /**
-        Specifies which properties dictate the arrangedContent's sort order.
+        Specifies which properties dictate the `arrangedContent`'s sort order.
 
         When specifying multiple properties the sorting will use properties
         from the `sortProperties` array prioritized from first to last.
@@ -33339,7 +33569,7 @@ enifed("ember-runtime/mixins/sortable",
       sortProperties: null,
 
       /**
-        Specifies the arrangedContent's sort direction.
+        Specifies the `arrangedContent`'s sort direction.
         Sorts the content in ascending order by default. Set to `false` to
         use descending order.
 
@@ -33351,13 +33581,14 @@ enifed("ember-runtime/mixins/sortable",
       /**
         The function used to compare two values. You can override this if you
         want to do custom comparisons. Functions must be of the type expected by
-        Array#sort, i.e.
-          return 0 if the two parameters are equal,
-          return a negative value if the first parameter is smaller than the second or
-          return a positive value otherwise:
+        Array#sort, i.e.,
+
+        *  return 0 if the two parameters are equal,
+        *  return a negative value if the first parameter is smaller than the second or
+        *  return a positive value otherwise:
 
         ```javascript
-        function(x,y) { // These are assumed to be integers
+        function(x, y) { // These are assumed to be integers
           if (x === y)
             return 0;
           return x < y ? -1 : 1;
@@ -33408,12 +33639,11 @@ enifed("ember-runtime/mixins/sortable",
       isSorted: computed.notEmpty('sortProperties'),
 
       /**
-        Overrides the default arrangedContent from arrayProxy in order to sort by sortFunction.
-        Also sets up observers for each sortProperty on each item in the content Array.
+        Overrides the default `arrangedContent` from `ArrayProxy` in order to sort by `sortFunction`.
+        Also sets up observers for each `sortProperty` on each item in the content Array.
 
         @property arrangedContent
       */
-
       arrangedContent: computed('content', 'sortProperties.@each', function(key, value) {
         var content = get(this, 'content');
         var isSorted = get(this, 'isSorted');
@@ -33556,8 +33786,8 @@ enifed("ember-runtime/mixins/sortable",
     });
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/mixin","ember-metal/computed","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -33567,10 +33797,9 @@ enifed("ember-runtime/mixins/target_action_support",
     // Ember.lookup, Ember.assert
 
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var typeOf = __dependency4__.typeOf;
-    var Mixin = __dependency5__.Mixin;
-    var computed = __dependency6__.computed;
+    var typeOf = __dependency3__.typeOf;
+    var Mixin = __dependency4__.Mixin;
+    var computed = __dependency5__.computed;
 
     /**
     `Ember.TargetActionSupport` is a mixin that can be included in a class
@@ -33714,25 +33943,25 @@ enifed("ember-runtime/system/application",
     __exports__["default"] = Namespace.extend();
   });
 enifed("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"],
+  ["ember-metal/core","ember-metal/property_get","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","ember-metal/alias","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.K, Ember.assert
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var isArray = __dependency4__.isArray;
-    var apply = __dependency4__.apply;
-    var computed = __dependency5__.computed;
-    var beforeObserver = __dependency6__.beforeObserver;
-    var observer = __dependency6__.observer;
-    var beginPropertyChanges = __dependency7__.beginPropertyChanges;
-    var endPropertyChanges = __dependency7__.endPropertyChanges;
-    var EmberError = __dependency8__["default"];
-    var EmberObject = __dependency9__["default"];
-    var MutableArray = __dependency10__["default"];
-    var Enumerable = __dependency11__["default"];
-    var fmt = __dependency12__.fmt;
+    var isArray = __dependency3__.isArray;
+    var apply = __dependency3__.apply;
+    var computed = __dependency4__.computed;
+    var beforeObserver = __dependency5__.beforeObserver;
+    var observer = __dependency5__.observer;
+    var beginPropertyChanges = __dependency6__.beginPropertyChanges;
+    var endPropertyChanges = __dependency6__.endPropertyChanges;
+    var EmberError = __dependency7__["default"];
+    var EmberObject = __dependency8__["default"];
+    var MutableArray = __dependency9__["default"];
+    var Enumerable = __dependency10__["default"];
+    var fmt = __dependency11__.fmt;
+    var alias = __dependency12__["default"];
 
     /**
     @module ember
@@ -33741,7 +33970,6 @@ enifed("ember-runtime/system/array_proxy",
 
     var OUT_OF_RANGE_EXCEPTION = "Index out of range";
     var EMPTY = [];
-    var alias = computed.alias;
     var K = Ember.K;
 
     /**
@@ -34092,18 +34320,18 @@ enifed("ember-runtime/system/array_proxy",
     __exports__["default"] = ArrayProxy;
   });
 enifed("ember-runtime/system/container",
-  ["ember-metal/property_set","exports"],
-  function(__dependency1__, __exports__) {
+  ["ember-metal/property_set","container","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var set = __dependency1__["default"];
+    var set = __dependency1__.set;
+    var Container = __dependency2__["default"];
 
-    var Container = requireModule('container')["default"];
     Container.set = set;
 
     __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"],
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/platform","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/injected_property","ember-metal/run_loop","ember-metal/watching","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
@@ -34121,32 +34349,32 @@ enifed("ember-runtime/system/core_object",
     // 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.
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var guidFor = __dependency4__.guidFor;
-    var apply = __dependency4__.apply;
-    var o_create = __dependency5__.create;
-    var generateGuid = __dependency4__.generateGuid;
-    var GUID_KEY = __dependency4__.GUID_KEY;
-    var meta = __dependency4__.meta;
-    var makeArray = __dependency4__.makeArray;
-    var rewatch = __dependency6__.rewatch;
-    var finishChains = __dependency7__.finishChains;
-    var sendEvent = __dependency8__.sendEvent;
-    var IS_BINDING = __dependency9__.IS_BINDING;
-    var Mixin = __dependency9__.Mixin;
-    var required = __dependency9__.required;
-    var indexOf = __dependency10__.indexOf;
-    var EmberError = __dependency11__["default"];
-    var o_defineProperty = __dependency5__.defineProperty;
-    var keys = __dependency12__["default"];
-    var ActionHandler = __dependency13__["default"];
-    var defineProperty = __dependency14__.defineProperty;
-    var Binding = __dependency15__.Binding;
-    var ComputedProperty = __dependency16__.ComputedProperty;
-    var run = __dependency17__["default"];
-    var destroy = __dependency6__.destroy;
+    var guidFor = __dependency3__.guidFor;
+    var apply = __dependency3__.apply;
+    var o_create = __dependency4__.create;
+    var generateGuid = __dependency3__.generateGuid;
+    var GUID_KEY = __dependency3__.GUID_KEY;
+    var meta = __dependency3__.meta;
+    var makeArray = __dependency3__.makeArray;
+    var finishChains = __dependency5__.finishChains;
+    var sendEvent = __dependency6__.sendEvent;
+    var IS_BINDING = __dependency7__.IS_BINDING;
+    var Mixin = __dependency7__.Mixin;
+    var required = __dependency7__.required;
+    var indexOf = __dependency8__.indexOf;
+    var EmberError = __dependency9__["default"];
+    var o_defineProperty = __dependency4__.defineProperty;
+    var keys = __dependency10__["default"];
+    var ActionHandler = __dependency11__["default"];
+    var defineProperty = __dependency12__.defineProperty;
+    var Binding = __dependency13__.Binding;
+    var ComputedProperty = __dependency14__.ComputedProperty;
+    var computed = __dependency14__.computed;
+    var InjectedProperty = __dependency15__["default"];
+    var run = __dependency16__["default"];
+    var destroy = __dependency17__.destroy;
     var K = __dependency1__.K;
-    var hasPropertyAccessors = __dependency5__.hasPropertyAccessors;
+    var hasPropertyAccessors = __dependency4__.hasPropertyAccessors;
 
     var schedule = run.schedule;
     var applyMixin = Mixin._apply;
@@ -34214,8 +34442,6 @@ enifed("ember-runtime/system/core_object",
 
             for (var j = 0, ll = keyNames.length; j < ll; j++) {
               var keyName = keyNames[j];
-              if (!properties.hasOwnProperty(keyName)) { continue; }
-
               var value = properties[keyName];
 
               if (IS_BINDING.test(keyName)) {
@@ -34236,7 +34462,9 @@ enifed("ember-runtime/system/core_object",
                            "time, when Ember.ActionHandler is used (i.e. views, " +
                            "controllers & routes).", !((keyName === 'actions') && ActionHandler.detect(this)));
 
-              if (concatenatedProperties && indexOf(concatenatedProperties, keyName) >= 0) {
+              if (concatenatedProperties && 
+                  concatenatedProperties.length > 0 &&
+                  indexOf(concatenatedProperties, keyName) >= 0) {
                 var baseValue = this[keyName];
 
                 if (baseValue) {
@@ -34297,7 +34525,6 @@ enifed("ember-runtime/system/core_object",
         if (!wasApplied) {
           wasApplied = true;
           Class.PrototypeMixin.applyPartial(Class.prototype);
-          rewatch(Class.prototype);
         }
 
         return this.prototype;
@@ -34550,7 +34777,7 @@ enifed("ember-runtime/system/core_object",
 
     CoreObject.__super__ = null;
 
-    var ClassMixin = Mixin.create({
+    var ClassMixinProps = {
 
       ClassMixin: required(),
 
@@ -34895,7 +35122,7 @@ enifed("ember-runtime/system/core_object",
         return desc._meta || {};
       },
 
-      _computedProperties: Ember.computed(function() {
+      _computedProperties: computed(function() {
         hasCachedComputedProperties = true;
         var proto = this.proto();
         var descs = meta(proto).descs;
@@ -34935,7 +35162,10 @@ enifed("ember-runtime/system/core_object",
           callback.call(binding || this, property.name, property.meta || empty);
         }
       }
-    });
+    };
+
+    
+    var ClassMixin = Mixin.create(ClassMixinProps);
 
     ClassMixin.ownerConstructor = CoreObject;
 
@@ -34963,13 +35193,12 @@ enifed("ember-runtime/system/core_object",
     __exports__["default"] = CoreObject;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-runtime/mixins/deferred","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var DeferredMixin = __dependency2__["default"];
-    var get = __dependency3__.get;
-    var EmberObject = __dependency4__["default"];
+    var EmberObject = __dependency3__["default"];
 
     var Deferred = EmberObject.extend(DeferredMixin, {
       init: function() {
@@ -34989,8 +35218,8 @@ enifed("ember-runtime/system/deferred",
     __exports__["default"] = Deferred;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/property_get","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__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -35001,26 +35230,25 @@ enifed("ember-runtime/system/each_proxy",
     // Ember.assert
 
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var guidFor = __dependency4__.guidFor;
-    var forEach = __dependency5__.forEach;
-    var indexOf = __dependency6__.indexOf;
-    var EmberArray = __dependency7__["default"];
+    var guidFor = __dependency3__.guidFor;
+    var forEach = __dependency4__.forEach;
+    var indexOf = __dependency5__.indexOf;
+    var EmberArray = __dependency6__["default"];
     // ES6TODO: WAT? Circular dep?
-    var EmberObject = __dependency8__["default"];
-    var computed = __dependency9__.computed;
-    var addObserver = __dependency10__.addObserver;
-    var addBeforeObserver = __dependency10__.addBeforeObserver;
-    var removeBeforeObserver = __dependency10__.removeBeforeObserver;
-    var removeObserver = __dependency10__.removeObserver;
-    var typeOf = __dependency4__.typeOf;
-    var watchedEvents = __dependency11__.watchedEvents;
-    var defineProperty = __dependency12__.defineProperty;
-    var beginPropertyChanges = __dependency13__.beginPropertyChanges;
-    var propertyDidChange = __dependency13__.propertyDidChange;
-    var propertyWillChange = __dependency13__.propertyWillChange;
-    var endPropertyChanges = __dependency13__.endPropertyChanges;
-    var changeProperties = __dependency13__.changeProperties;
+    var EmberObject = __dependency7__["default"];
+    var computed = __dependency8__.computed;
+    var addObserver = __dependency9__.addObserver;
+    var addBeforeObserver = __dependency9__.addBeforeObserver;
+    var removeBeforeObserver = __dependency9__.removeBeforeObserver;
+    var removeObserver = __dependency9__.removeObserver;
+    var typeOf = __dependency3__.typeOf;
+    var watchedEvents = __dependency10__.watchedEvents;
+    var defineProperty = __dependency11__.defineProperty;
+    var beginPropertyChanges = __dependency12__.beginPropertyChanges;
+    var propertyDidChange = __dependency12__.propertyDidChange;
+    var propertyWillChange = __dependency12__.propertyWillChange;
+    var endPropertyChanges = __dependency12__.endPropertyChanges;
+    var changeProperties = __dependency12__.changeProperties;
 
     var EachArray = EmberObject.extend(EmberArray, {
 
@@ -35433,7 +35661,7 @@ enifed("ember-runtime/system/namespace",
 
     function findNamespaces() {
       var lookup = Ember.lookup;
-      var obj, isNamespace;
+      var obj;
 
       if (Namespace.PROCESSED) { return; }
 
@@ -35520,8 +35748,8 @@ 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__) {
+  ["ember-metal/core","ember-metal/property_get","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__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -35532,18 +35760,17 @@ enifed("ember-runtime/system/native_array",
     // Ember.EXTEND_PROTOTYPES
 
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    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 replace = __dependency3__._replace;
+    var forEach = __dependency3__.forEach;
+    var Mixin = __dependency4__.Mixin;
+    var indexOf = __dependency5__.indexOf;
+    var lastIndexOf = __dependency5__.lastIndexOf;
+    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
@@ -35698,16 +35925,19 @@ enifed("ember-runtime/system/native_array",
     __exports__["default"] = NativeArray;
   });
 enifed("ember-runtime/system/object",
-  ["ember-runtime/system/core_object","ember-runtime/mixins/observable","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+  ["ember-metal/core","ember-runtime/system/core_object","ember-runtime/mixins/observable","ember-runtime/inject","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
     @module ember
     @submodule ember-runtime
     */
 
-    var CoreObject = __dependency1__["default"];
-    var Observable = __dependency2__["default"];
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var CoreObject = __dependency2__["default"];
+    var Observable = __dependency3__["default"];
+    var validatePropertyInjections = __dependency4__.validatePropertyInjections;
 
     /**
       `Ember.Object` is the main base class for all Ember objects. It is a subclass
@@ -35724,6 +35954,13 @@ enifed("ember-runtime/system/object",
       return "Ember.Object";
     };
 
+    function injectedPropertyAssertion(props) {
+      // Injection validations are a debugging aid only, so ensure that they are
+      // not performed in production builds by invoking from an assertion
+      Ember.assert("Injected properties are invalid", validatePropertyInjections(this.constructor, props));
+    }
+
+    
     __exports__["default"] = EmberObject;
   });
 enifed("ember-runtime/system/object_proxy",
@@ -35804,6 +36041,18 @@ enifed("ember-runtime/system/object_proxy",
 
     __exports__["default"] = EmberObject.extend(_ProxyMixin);
   });
+enifed("ember-runtime/system/service",
+  ["ember-runtime/system/object","ember-runtime/inject","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Object = __dependency1__["default"];
+    var createInjectionHelper = __dependency2__.createInjectionHelper;
+
+    var Service;
+
+    
+    __exports__["default"] = Service;
+  });
 enifed("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__) {
@@ -35818,7 +36067,7 @@ enifed("ember-runtime/system/set",
     var get = __dependency2__.get;
     var set = __dependency3__.set;
     var guidFor = __dependency4__.guidFor;
-    var isNone = __dependency5__.isNone;
+    var isNone = __dependency5__["default"];
     var fmt = __dependency6__.fmt;
     var CoreObject = __dependency7__["default"];
     var MutableEnumerable = __dependency8__["default"];
@@ -35928,6 +36177,7 @@ enifed("ember-runtime/system/set",
       @uses Ember.Copyable
       @uses Ember.Freezable
       @since Ember 0.9
+      @deprecated
     */
     __exports__["default"] = CoreObject.extend(MutableEnumerable, Copyable, Freezable, {
 
@@ -36592,12 +36842,11 @@ enifed("ember-runtime/system/string",
     __exports__.capitalize = capitalize;
   });
 enifed("ember-runtime/system/subarray",
-  ["ember-metal/property_get","ember-metal/error","ember-metal/enumerable_utils","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/error","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var get = __dependency1__.get;
-    var EmberError = __dependency2__["default"];
-    var EnumerableUtils = __dependency3__["default"];
+    var EmberError = __dependency1__["default"];
+    var EnumerableUtils = __dependency2__["default"];
 
     var RETAIN = 'r';
     var FILTER = 'f';
@@ -36829,7 +37078,7 @@ enifed("ember-runtime/system/tracked_array",
         var arrayOperation = match.operation;
         var arrayOperationIndex = match.index;
         var arrayOperationRangeStart = match.rangeStart;
-        var composeIndex, splitIndex, splitItems, splitArrayOperation, newArrayOperation;
+        var composeIndex, newArrayOperation;
 
         newArrayOperation = new ArrayOperation(INSERT, count, newItems);
 
@@ -36862,7 +37111,6 @@ enifed("ember-runtime/system/tracked_array",
         if (count < 1) { return; }
 
         var match = this._findArrayOperation(index);
-        var arrayOperation = match.operation;
         var arrayOperationIndex = match.index;
         var arrayOperationRangeStart = match.rangeStart;
         var newArrayOperation, composeIndex;
@@ -37134,13 +37382,12 @@ enifed("ember-testing",
     Ember.setupForTesting = setupForTesting;
   });
 enifed("ember-testing/adapters/adapter",
-  ["ember-metal/core","ember-metal/utils","ember-runtime/system/object","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/core","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.K
-    var inspect = __dependency2__.inspect;
-    var EmberObject = __dependency3__["default"];
+    var EmberObject = __dependency2__["default"];
 
     /**
      @module ember
@@ -37262,6 +37509,11 @@ enifed("ember-testing/helpers",
       return get(router, 'location').getURL();
     }
 
+    function pauseTest(){
+      Test.adapter.asyncStart();
+      return new Ember.RSVP.Promise(function(){ }, 'TestAdapter paused promise');
+    }
+
     function visit(app, url) {
       var router = app.__container__.lookup('router:main');
       router.location.setURL(url);
@@ -37551,7 +37803,7 @@ enifed("ember-testing/helpers",
       Ember.Test.registerAsyncHelper('loginUser', function(app, username, password) {
         visit('secured/path/here')
         .fillIn('#username', username)
-        .fillIn('#password', username)
+        .fillIn('#password', password)
         .click('.submit')
 
         return app.testHelpers.wait();
@@ -37622,6 +37874,26 @@ enifed("ember-testing/helpers",
     */
     helper('currentURL', currentURL);
 
+    
+      /**
+       Pauses the current test - this is useful for debugging while testing or for test-driving.
+       It allows you to inspect the state of your application at any point.
+
+       Example (The test will pause before clicking the button):
+
+       ```javascript
+       visit('/')
+       return pauseTest();
+
+       click('.btn');
+       ```
+
+       @method pauseTest
+       @return {Object} A promise that will never resolve
+       */
+      helper('pauseTest', pauseTest);
+    
+
     /**
       Triggers the given DOM event on the element identified by the provided selector.
 
@@ -38326,6 +38598,8 @@ enifed("ember-views",
     var Ember = __dependency1__["default"];
     var jQuery = __dependency2__["default"];
     var isSimpleClick = __dependency3__.isSimpleClick;
+    var getViewClientRects = __dependency3__.getViewClientRects;
+    var getViewBoundingClientRect = __dependency3__.getViewBoundingClientRect;
     var RenderBuffer = __dependency4__["default"];
      // for the side effect of extending Ember.run.queues
     var cloneStates = __dependency6__.cloneStates;
@@ -38356,6 +38630,8 @@ enifed("ember-views",
 
     var ViewUtils = Ember.ViewUtils = {};
     ViewUtils.isSimpleClick = isSimpleClick;
+    ViewUtils.getViewClientRects = getViewClientRects;
+    ViewUtils.getViewBoundingClientRect = getViewBoundingClientRect;
 
     Ember.CoreView = CoreView;
     Ember.View = View;
@@ -38439,15 +38715,12 @@ enifed("ember-views/mixins/component_template_deprecation",
     });
   });
 enifed("ember-views/mixins/view_target_action_support",
-  ["ember-metal/mixin","ember-runtime/mixins/target_action_support","ember-metal/computed","exports"],
+  ["ember-metal/mixin","ember-runtime/mixins/target_action_support","ember-metal/alias","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var Mixin = __dependency1__.Mixin;
     var TargetActionSupport = __dependency2__["default"];
-
-    // ES6TODO: computed should have its own export path so you can do import {defaultTo} from computed
-    var computed = __dependency3__.computed;
-    var alias = computed.alias;
+    var alias = __dependency3__["default"];
 
     /**
     `Ember.ViewTargetActionSupport` is a mixin that can be included in a
@@ -38501,6 +38774,213 @@ enifed("ember-views/mixins/view_target_action_support",
       actionContext: alias('context')
     });
   });
+enifed("ember-views/streams/context_stream",
+  ["ember-metal/core","ember-metal/merge","ember-metal/platform","ember-metal/path_cache","ember-metal/streams/stream","ember-metal/streams/simple","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+
+    var merge = __dependency2__["default"];
+    var create = __dependency3__.create;
+    var isGlobal = __dependency4__.isGlobal;
+    var Stream = __dependency5__["default"];
+    var SimpleStream = __dependency6__["default"];
+
+    function ContextStream(view) {
+      Ember.assert("ContextStream error: the argument is not a view", view && view.isView);
+      this.view = view;
+    }
+
+    ContextStream.prototype = create(Stream.prototype);
+
+    merge(ContextStream.prototype, {
+      value: function() {},
+
+      _makeChildStream: function(key, _fullPath) {
+        var stream;
+
+        if (key === '' || key === 'this') {
+          stream = this.view._baseContext;
+        } else if (isGlobal(key) && Ember.lookup[key]) {
+          Ember.deprecate("Global lookup of " + _fullPath + " from a Handlebars template is deprecated.");
+          stream = new SimpleStream(Ember.lookup[key]);
+          stream._isGlobal = true;
+        } else if (key in this.view._keywords) {
+          stream = new SimpleStream(this.view._keywords[key]);
+        } else {
+          stream = new SimpleStream(this.view._baseContext.get(key));
+        }
+
+        stream._isRoot = true;
+
+        if (key === 'controller') {
+          stream._isController = true;
+        }
+
+        return stream;
+      }
+    });
+
+    __exports__["default"] = ContextStream;
+  });
+enifed("ember-views/streams/key_stream",
+  ["ember-metal/core","ember-metal/merge","ember-metal/platform","ember-metal/property_get","ember-metal/property_set","ember-metal/observer","ember-metal/streams/stream","ember-metal/streams/read","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+
+    var merge = __dependency2__["default"];
+    var create = __dependency3__.create;
+    var get = __dependency4__.get;
+    var set = __dependency5__.set;
+    var addObserver = __dependency6__.addObserver;
+    var removeObserver = __dependency6__.removeObserver;
+    var Stream = __dependency7__["default"];
+    var read = __dependency8__.read;
+
+    function KeyStream(source, key) {
+      Ember.assert("KeyStream error: key must be a non-empty string", typeof key === 'string' && key.length > 0);
+      Ember.assert("KeyStream error: key must not have a '.'", key.indexOf('.') === -1);
+
+      this.source = source;
+      this.obj = undefined;
+      this.key = key;
+
+      if (source && source.isStream) {
+        source.subscribe(this._didChange, this);
+      }
+    }
+
+    KeyStream.prototype = create(Stream.prototype);
+
+    merge(KeyStream.prototype, {
+      valueFn: function() {
+        var prevObj = this.obj;
+        var nextObj = read(this.source);
+
+        if (nextObj !== prevObj) {
+          if (prevObj && typeof prevObj === 'object') {
+            removeObserver(prevObj, this.key, this, this._didChange);
+          }
+
+          if (nextObj && typeof nextObj === 'object') {
+            addObserver(nextObj, this.key, this, this._didChange);
+          }
+
+          this.obj = nextObj;
+        }
+
+        if (nextObj) {
+          return get(nextObj, this.key);
+        }
+      },
+
+      setValue: function(value) {
+        if (this.obj) {
+          set(this.obj, this.key, value);
+        }
+      },
+
+      setSource: function(nextSource) {
+        Ember.assert("KeyStream error: source must be an object", typeof nextSource === 'object');
+
+        var prevSource = this.source;
+
+        if (nextSource !== prevSource) {
+          if (prevSource && prevSource.isStream) {
+            prevSource.unsubscribe(this._didChange, this);
+          }
+
+          if (nextSource && nextSource.isStream) {
+            nextSource.subscribe(this._didChange, this);
+          }
+
+          this.source = nextSource;
+          this.notify();
+        }
+      },
+
+      _didChange: function() {
+        this.notify();
+      },
+
+      destroy: function() {
+        if (this.source && this.source.isStream) {
+          this.source.unsubscribe(this._didChange, this);
+        }
+
+        if (this.obj && typeof this.obj === 'object') {
+          removeObserver(this.obj, this.key, this, this._didChange);
+        }
+
+        this.source = undefined;
+        this.obj = undefined;
+
+        Stream.prototype.destroy.call(this);
+      }
+    });
+
+    __exports__["default"] = KeyStream;
+
+    // The transpiler does not resolve cycles, so we export
+    // the `_makeChildStream` method onto `Stream` here.
+
+    Stream.prototype._makeChildStream = function(key) {
+      return new KeyStream(this, key);
+    };
+  });
+enifed("ember-views/streams/read",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/path_cache","ember-runtime/system/string","ember-metal/streams/read","ember-views/views/view","ember-runtime/mixins/controller","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var isGlobal = __dependency3__.isGlobal;
+    var fmt = __dependency4__.fmt;
+    var read = __dependency5__.read;
+    var View = __dependency6__["default"];
+    var ControllerMixin = __dependency7__["default"];
+
+    function readViewFactory(object, container) {
+      var value = read(object);
+      var viewClass;
+
+      if (typeof value === 'string') {
+        if (isGlobal(value)) {
+          viewClass = get(null, value);
+          Ember.deprecate('Resolved the view "'+value+'" 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', !viewClass);
+        } else {
+          Ember.assert("View requires a container to resolve views not passed in through the context", !!container);
+          viewClass = container.lookupFactory('view:'+value);
+        }
+      } else {
+        viewClass = value;
+      }
+
+      Ember.assert(fmt(value+" must be a subclass of Ember.View, not %@", [viewClass]), View.detect(viewClass));
+
+      return viewClass;
+    }
+
+    __exports__.readViewFactory = readViewFactory;function readUnwrappedModel(object) {
+      if (object && object.isStream) {
+        var result = object.value();
+
+        // If the path is exactly `controller` then we don't unwrap it.
+        if (!object._isController) {
+          while (ControllerMixin.detect(result)) {
+            result = get(result, 'model');
+          }
+        }
+
+        return result;
+      } else {
+        return object;
+      }
+    }
+
+    __exports__.readUnwrappedModel = readUnwrappedModel;
+  });
 enifed("ember-views/system/action_manager",
   ["exports"],
   function(__exports__) {
@@ -38536,7 +39016,7 @@ enifed("ember-views/system/event_dispatcher",
 
     var get = __dependency2__.get;
     var set = __dependency3__.set;
-    var isNone = __dependency4__.isNone;
+    var isNone = __dependency4__["default"];
     var run = __dependency5__["default"];
     var typeOf = __dependency6__.typeOf;
     var fmt = __dependency7__.fmt;
@@ -38761,7 +39241,7 @@ enifed("ember-views/system/event_dispatcher",
       },
 
       _bubbleEvent: function(view, evt, eventName) {
-        return run(view, view.handleEvent, eventName, evt);
+        return run.join(view, view.handleEvent, eventName, evt);
       },
 
       destroy: function() {
@@ -38789,20 +39269,18 @@ enifed("ember-views/system/ext",
     // Add a new named queue for rendering views that happens
     // after bindings have synced, and a queue for scheduling actions
     // that that should occur after view rendering.
-    var queues = run.queues;
     run._addQueue('render', 'actions');
     run._addQueue('afterRender', 'render');
   });
 enifed("ember-views/system/jquery",
-  ["ember-metal/core","ember-runtime/system/string","ember-metal/enumerable_utils","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/core","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert
-    var w = __dependency2__.w;
 
     // ES6TODO: the functions on EnumerableUtils need their own exports
-    var forEach = __dependency3__.forEach;
+    var forEach = __dependency2__.forEach;
 
     /**
     Ember Views
@@ -38818,7 +39296,9 @@ enifed("ember-views/system/jquery",
       jQuery = eriuqer('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));
+    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));
 
     /**
     @module ember
@@ -38826,12 +39306,22 @@ enifed("ember-views/system/jquery",
     */
     if (jQuery) {
       // http://www.whatwg.org/specs/web-apps/current-work/multipage/dnd.html#dndevents
-      var dragEvents = w('dragstart drag dragenter dragleave dragover drop dragend');
+      var dragEvents = [
+        'dragstart',
+        'drag',
+        'dragenter',
+        'dragleave',
+        'dragover',
+        'drop',
+        'dragend'
+      ];
 
       // Copies the `dataTransfer` property from a browser event object onto the
       // jQuery event object for the specified events
       forEach(dragEvents, function(eventName) {
-        jQuery.event.fixHooks[eventName] = { props: ['dataTransfer'] };
+        jQuery.event.fixHooks[eventName] = {
+          props: ['dataTransfer']
+        };
       });
     }
 
@@ -38908,10 +39398,6 @@ enifed("ember-views/system/render_buffer",
         this.seen[string] = true;
 
         this.list.push(string);
-      },
-
-      toDOM: function() {
-        return this.list.join(" ");
       }
     };
 
@@ -39448,25 +39934,12 @@ enifed("ember-views/system/renderer",
 
     function EmberRenderer() {
       this.buffer = renderBuffer();
-      Renderer.call(this);
+      this._super$constructor();
     }
+
     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._super$constructor = Renderer;
 
     EmberRenderer.prototype.scheduleRender =
       function EmberRenderer_scheduleRender(ctx, fn) {
@@ -39478,25 +39951,6 @@ enifed("ember-views/system/renderer",
         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,
@@ -39537,10 +39991,6 @@ enifed("ember-views/system/renderer",
 
         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
@@ -39621,11 +40071,55 @@ enifed("ember-views/system/utils",
       return !modifier && !secondaryClick;
     }
 
-    __exports__.isSimpleClick = isSimpleClick;
+    __exports__.isSimpleClick = isSimpleClick;/**
+      @private
+      @method getViewRange
+      @param {Ember.View} view
+    */
+    function getViewRange(view) {
+      var range = document.createRange();
+      range.setStartAfter(view._morph.start);
+      range.setEndBefore(view._morph.end);
+      return range;
+    }
+
+    /**
+      `getViewClientRects` provides information about the position of the border
+      box edges of a view relative to the viewport.
+
+      It is only intended to be used by development tools like the Ember Inpsector
+      and may not work on older browsers.
+
+      @private
+      @method getViewClientRects
+      @param {Ember.View} view
+    */
+    function getViewClientRects(view) {
+      var range = getViewRange(view);
+      return range.getClientRects();
+    }
+
+    __exports__.getViewClientRects = getViewClientRects;/**
+      `getViewBoundingClientRect` provides information about the position of the
+      bounding border box edges of a view relative to the viewport.
+
+      It is only intended to be used by development tools like the Ember Inpsector
+      and may not work on older browsers.
+
+      @private
+      @method getViewBoundingClientRect
+      @param {Ember.View} view
+    */
+    function getViewBoundingClientRect(view) {
+      var range = getViewRange(view);
+      return range.getBoundingClientRect();
+    }
+
+    __exports__.getViewBoundingClientRect = getViewBoundingClientRect;
   });
 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__) {
+  ["ember-metal/core","ember-metal/binding","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-views/streams/read","ember-runtime/mixins/array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
 
     /**
@@ -39635,19 +40129,17 @@ enifed("ember-views/views/collection_view",
 
     var Ember = __dependency1__["default"];
     // Ember.assert
-    var create = __dependency2__.create;
-    var isGlobalPath = __dependency3__.isGlobalPath;
-    var merge = __dependency4__["default"];
-    var get = __dependency5__.get;
-    var set = __dependency6__.set;
-    var fmt = __dependency7__.fmt;
-    var ContainerView = __dependency8__["default"];
-    var CoreView = __dependency9__["default"];
-    var View = __dependency10__["default"];
-    var observer = __dependency11__.observer;
-    var beforeObserver = __dependency11__.beforeObserver;
-    var handlebarsGetView = __dependency12__.handlebarsGetView;
-    var EmberArray = __dependency13__["default"];
+    var isGlobalPath = __dependency2__.isGlobalPath;
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var fmt = __dependency5__.fmt;
+    var ContainerView = __dependency6__["default"];
+    var CoreView = __dependency7__["default"];
+    var View = __dependency8__["default"];
+    var observer = __dependency9__.observer;
+    var beforeObserver = __dependency9__.beforeObserver;
+    var readViewFactory = __dependency10__.readViewFactory;
+    var EmberArray = __dependency11__["default"];
 
     /**
       `Ember.CollectionView` is an `Ember.View` descendent responsible for managing
@@ -39973,21 +40465,23 @@ enifed("ember-views/views/collection_view",
       */
       arrayDidChange: function(content, start, removed, added) {
         var addedViews = [];
-        var view, item, idx, len, itemViewClass, emptyView;
+        var view, item, idx, len, itemViewClass, emptyView, itemViewProps;
 
         len = content ? get(content, 'length') : 0;
 
         if (len) {
+          itemViewProps = this._itemViewProps || {};
           itemViewClass = get(this, 'itemViewClass');
-          itemViewClass = handlebarsGetView(content, itemViewClass, this.container);
+
+          itemViewClass = readViewFactory(itemViewClass, this.container);
 
           for (idx = start; idx < start+added; idx++) {
             item = content.objectAt(idx);
 
-            view = this.createChildView(itemViewClass, {
-              content: item,
-              contentIndex: idx
-            });
+            itemViewProps.content = item;
+            itemViewProps.contentIndex = idx;
+
+            view = this.createChildView(itemViewClass, itemViewProps);
 
             addedViews.push(view);
           }
@@ -40001,6 +40495,7 @@ enifed("ember-views/views/collection_view",
           }
 
           emptyView = this.createChildView(emptyView);
+
           addedViews.push(emptyView);
           set(this, 'emptyView', emptyView);
 
@@ -40077,7 +40572,7 @@ enifed("ember-views/views/component",
 
     var get = __dependency5__.get;
     var set = __dependency6__.set;
-    var isNone = __dependency7__.isNone;
+    var isNone = __dependency7__["default"];
 
     var computed = __dependency8__.computed;
 
@@ -40183,7 +40678,6 @@ enifed("ember-views/views/component",
 
       init: function() {
         this._super();
-        set(this, 'origContext', get(this, 'context'));
         set(this, 'context', this);
         set(this, 'controller', this);
       },
@@ -40231,12 +40725,8 @@ enifed("ember-views/views/component",
       */
       templateName: null,
 
-      // during render, isolate keywords
-      cloneKeywords: function() {
-        return {
-          view: this,
-          controller: this
-        };
+      _setupKeywords: function() {
+        this._keywords.view.setSource(this);
       },
 
       _yield: function(context, options) {
@@ -40252,9 +40742,9 @@ enifed("ember-views/views/component",
             tagName: '',
             _contextView: parentView,
             template: template,
-            context: options.data.insideGroup ? get(this, 'origContext') : get(parentView, 'context'),
+            context: get(parentView, 'context'),
             controller: get(parentView, 'controller'),
-            templateData: { keywords: parentView.cloneKeywords(), insideGroup: options.data.insideGroup }
+            templateData: { keywords: {} }
           });
         }
       },
@@ -40377,14 +40867,38 @@ enifed("ember-views/views/component",
           action: actionName,
           actionContext: contexts
         });
+      },
+
+      send: function(actionName) {
+        var args = [].slice.call(arguments, 1);
+        var target;
+        var hasAction = this._actions && this._actions[actionName];
+
+        if (hasAction) {
+          if (this._actions[actionName].apply(this, args) === true) {
+            // handler returned true, so this action will bubble
+          } else {
+            return;
+          }
+        }
+
+        if (target = get(this, 'target')) {
+          Ember.assert("The `target` for " + this + " (" + target +
+                       ") does not have a `send` method", typeof target.send === 'function');
+          target.send.apply(target, arguments);
+        } else {
+          if (!hasAction) {
+            throw new Error(Ember.inspect(this) + ' had no action handler for: ' + actionName);
+          }
+        }
       }
     });
 
     __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__) {
+  ["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-metal/mixin","ember-runtime/system/native_array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert, Ember.K
@@ -40406,10 +40920,9 @@ enifed("ember-views/views/container_view",
     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 observer = __dependency13__.observer;
+    var beforeObserver = __dependency13__.beforeObserver;
+    var emberA = __dependency14__.A;
 
     /**
     @module ember
@@ -40569,7 +41082,6 @@ enifed("ember-views/views/container_view",
       @extends Ember.View
     */
     var ContainerView = View.extend(MutableArray, {
-      isContainer: true,
       _states: states,
 
       willWatchProperty: function(prop){
@@ -40583,6 +41095,7 @@ enifed("ember-views/views/container_view",
         this._super();
 
         var childViews = get(this, 'childViews');
+        Ember.deprecate('Setting `childViews` on a Container is deprecated.', Ember.isEmpty(childViews));
 
         // redefine view's childViews property that was obliterated
         defineProperty(this, 'childViews', View.childViewsProperty);
@@ -40648,6 +41161,18 @@ enifed("ember-views/views/container_view",
         @param {Ember.RenderBuffer} buffer the buffer to render to
       */
       render: function(buffer) {
+        var element = buffer.element();
+        var dom = buffer.dom;
+
+        if (this.tagName === '') {
+          element = dom.createDocumentFragment();
+          buffer._element = element;
+          this._childViewsMorph = dom.appendMorph(element, this._morph.contextualElement);
+        } else {
+          this._childViewsMorph = dom.createMorph(element, element.lastChild, null);
+        }
+
+        return element;
       },
 
       instrumentName: 'container',
@@ -40757,7 +41282,9 @@ enifed("ember-views/views/container_view",
     merge(states.hasElement, {
       childViewsWillChange: function(view, views, start, removed) {
         for (var i=start; i<start+removed; i++) {
-          views[i].remove();
+          var _view = views[i];
+          _view._unsubscribeFromStreamBindings();
+          _view.remove();
         }
       },
 
@@ -40782,8 +41309,8 @@ enifed("ember-views/views/container_view",
     __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__) {
+  ["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/computed","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
     var Rerender = __dependency1__["default"];
 
@@ -40794,13 +41321,9 @@ enifed("ember-views/views/core_view",
     var ActionHandler = __dependency5__["default"];
 
     var get = __dependency6__.get;
-    var set = __dependency7__.set;
-    var computed = __dependency8__.computed;
-
-    var typeOf = __dependency9__.typeOf;
-
-    var instrument = __dependency10__.instrument;
+    var computed = __dependency7__.computed;
 
+    var typeOf = __dependency8__.typeOf;
     /**
       `Ember.CoreView` is an abstract class that exists to give view-like behavior
       to both Ember's main view class `Ember.View` and other classes like
@@ -40819,7 +41342,6 @@ enifed("ember-views/views/core_view",
     var CoreView = EmberObject.extend(Evented, ActionHandler, {
       isView: true,
       isVirtual: false,
-      isContainer: false,
 
       _states: cloneStates(states),
 
@@ -40966,15 +41488,12 @@ enifed("ember-views/views/states",
     __exports__.states = states;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.K
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var run = __dependency4__["default"];
-    var EmberError = __dependency5__["default"];
+    var EmberError = __dependency2__["default"];
 
     /**
     @module ember
@@ -41042,8 +41561,8 @@ enifed("ember-views/views/states/destroying",
     __exports__["default"] = destroying;
   });
 enifed("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__) {
+  ["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","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     var _default = __dependency1__["default"];
     var run = __dependency2__["default"];
@@ -41058,7 +41577,6 @@ enifed("ember-views/views/states/has_element",
     */
 
     var get = __dependency7__.get;
-    var set = __dependency8__.set;
 
     var hasElement = create(_default);
 
@@ -41223,13 +41741,11 @@ enifed("ember-views/views/states/in_dom",
     __exports__["default"] = inDOM;
   });
 enifed("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__) {
+  ["ember-views/views/states/default","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var _default = __dependency1__["default"];
     var create = __dependency2__.create;
-    var merge = __dependency3__["default"];
-    var jQuery = __dependency4__["default"];
 
     /**
     @module ember
@@ -41240,57 +41756,58 @@ enifed("ember-views/views/states/pre_render",
     __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"],
-  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__) {
+  ["ember-metal/core","ember-metal/platform","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/streams/simple","ember-views/streams/key_stream","ember-metal/streams/stream_binding","ember-views/streams/context_stream","ember-metal/is_none","ember-metal/deprecate_property","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_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__, __dependency27__, __exports__) {
     "use strict";
     // Ember.assert, Ember.deprecate, Ember.warn, Ember.TEMPLATES,
     // Ember.K, jQuery, Ember.lookup,
     // Ember.ContainerView circular dependency
     // Ember.ENV
     var Ember = __dependency1__["default"];
+    var create = __dependency2__.create;
 
-    var Evented = __dependency2__["default"];
-    var EmberObject = __dependency3__["default"];
-    var EmberError = __dependency4__["default"];
-    var get = __dependency5__.get;
-    var set = __dependency6__.set;
-    var setProperties = __dependency7__["default"];
-    var run = __dependency8__["default"];
-    var addObserver = __dependency9__.addObserver;
-    var removeObserver = __dependency9__.removeObserver;
+    var Evented = __dependency3__["default"];
+    var EmberObject = __dependency4__["default"];
+    var EmberError = __dependency5__["default"];
+    var get = __dependency6__.get;
+    var set = __dependency7__.set;
+    var setProperties = __dependency8__["default"];
+    var run = __dependency9__["default"];
+    var addObserver = __dependency10__.addObserver;
+    var removeObserver = __dependency10__.removeObserver;
+    var defineProperty = __dependency11__.defineProperty;
+    var guidFor = __dependency12__.guidFor;
+    var computed = __dependency13__.computed;
+    var observer = __dependency14__.observer;
+    var SimpleStream = __dependency15__["default"];
+    var KeyStream = __dependency16__["default"];
+    var StreamBinding = __dependency17__["default"];
+    var ContextStream = __dependency18__["default"];
 
-    var defineProperty = __dependency10__.defineProperty;
-    var deprecateProperty = __dependency10__.deprecateProperty;
-    var guidFor = __dependency11__.guidFor;
-    var meta = __dependency11__.meta;
-    var computed = __dependency12__.computed;
-    var observer = __dependency13__.observer;
+    var typeOf = __dependency12__.typeOf;
+    var isArray = __dependency12__.isArray;
+    var isNone = __dependency19__["default"];
+    var Mixin = __dependency14__.Mixin;
+    var deprecateProperty = __dependency20__.deprecateProperty;
+    var emberA = __dependency21__.A;
 
-    var typeOf = __dependency11__.typeOf;
-    var isArray = __dependency11__.isArray;
-    var isNone = __dependency14__.isNone;
-    var Mixin = __dependency13__.Mixin;
-    var deprecateProperty = __dependency15__.deprecateProperty;
-    var emberA = __dependency16__.A;
-
-    var dasherize = __dependency17__.dasherize;
+    var dasherize = __dependency22__.dasherize;
 
     // ES6TODO: functions on EnumerableUtils should get their own export
-    var forEach = __dependency18__.forEach;
-    var addObject = __dependency18__.addObject;
-    var removeObject = __dependency18__.removeObject;
+    var forEach = __dependency23__.forEach;
+    var addObject = __dependency23__.addObject;
+    var removeObject = __dependency23__.removeObject;
 
-    var beforeObserver = __dependency13__.beforeObserver;
-    var copy = __dependency19__["default"];
-    var isGlobalPath = __dependency20__.isGlobalPath;
+    var beforeObserver = __dependency14__.beforeObserver;
 
-    var propertyWillChange = __dependency21__.propertyWillChange;
-    var propertyDidChange = __dependency21__.propertyDidChange;
+    var propertyWillChange = __dependency24__.propertyWillChange;
+    var propertyDidChange = __dependency24__.propertyDidChange;
 
-    var jQuery = __dependency22__["default"];
+    var jQuery = __dependency25__["default"];
      // for the side effect of extending Ember.run.queues
 
-    var CoreView = __dependency24__["default"];
+    var CoreView = __dependency27__["default"];
+
 
     /**
     @module ember
@@ -41299,7 +41816,6 @@ enifed("ember-views/views/view",
     var childViewsProperty = computed(function() {
       var childViews = this._childViews;
       var ret = emberA();
-      var view = this;
 
       forEach(childViews, function(view) {
         var currentChildViews;
@@ -42235,6 +42751,7 @@ enifed("ember-views/views/view",
       _parentViewDidChange: observer('_parentView', function() {
         if (this.isDestroying) { return; }
 
+        this._setupKeywords();
         this.trigger('parentViewDidChange');
 
         if (get(this, 'parentView.controller') && !get(this, 'controller')) {
@@ -42252,15 +42769,22 @@ enifed("ember-views/views/view",
         });
       }),
 
-      cloneKeywords: function() {
-        var templateData = get(this, 'templateData');
+      _setupKeywords: function() {
+        var keywords = this._keywords;
+        var contextView = this._contextView || this._parentView;
 
-        var keywords = templateData ? copy(templateData.keywords) : {};
-        set(keywords, 'view', this.isVirtual ? keywords.view : this);
-        set(keywords, '_view', this);
-        set(keywords, 'controller', get(this, 'controller'));
+        if (contextView) {
+          var parentKeywords = contextView._keywords;
 
-        return keywords;
+          keywords.view.setSource(this.isVirtual ? parentKeywords.view : this);
+
+          for (var name in parentKeywords) {
+            if (keywords[name]) continue;
+            keywords[name] = parentKeywords[name];
+          }
+        } else {
+          keywords.view.setSource(this.isVirtual ? null : this);
+        }
       },
 
       /**
@@ -42283,15 +42807,12 @@ enifed("ember-views/views/view",
 
         if (template) {
           var context = get(this, 'context');
-          var keywords = this.cloneKeywords();
           var output;
 
           var data = {
             view: this,
             buffer: buffer,
-            isRenderData: true,
-            keywords: keywords,
-            insideGroup: get(this, 'templateData.insideGroup')
+            isRenderData: true
           };
 
           // Invoke the template with the provided template context, which
@@ -42347,20 +42868,30 @@ enifed("ember-views/views/view",
         // ('content.isUrgent')
         forEach(classBindings, function(binding) {
 
-          Ember.assert("classNameBindings must not have spaces in them. Multiple class name bindings can be provided as elements of an array, e.g. ['foo', ':bar']", binding.indexOf(' ') === -1);
+          var parsedPath;
+
+          if (typeof binding === 'string') {
+            Ember.assert("classNameBindings must not have spaces in them. Multiple class name bindings can be provided as elements of an array, e.g. ['foo', ':bar']", binding.indexOf(' ') === -1);
+            parsedPath = View._parsePropertyPath(binding);
+            if (parsedPath.path === '') {
+              parsedPath.stream = new SimpleStream(true);
+            } else {
+              parsedPath.stream = this.getStream('_view.' + parsedPath.path);
+            }
+          } else {
+            parsedPath = binding;
+          }
 
           // Variable in which the old class value is saved. The observer function
           // closes over this variable, so it knows which string to remove when
           // the property changes.
           var oldClass;
-          // Extract just the property name from bindings like 'foo:bar'
-          var parsedPath = View._parsePropertyPath(binding);
 
           // Set up an observer on the context. If the property changes, toggle the
           // class name.
-          var observer = function() {
+          var observer = this._wrapAsScheduled(function() {
             // Get the current value of the property
-            newClass = this._classStringForProperty(binding);
+            newClass = this._classStringForProperty(parsedPath);
             elem = this.$();
 
             // If we had previously added a class to the element, remove it.
@@ -42379,10 +42910,10 @@ enifed("ember-views/views/view",
             } else {
               oldClass = null;
             }
-          };
+          });
 
           // Get the class name for the property at its current value
-          dasherizedClass = this._classStringForProperty(binding);
+          dasherizedClass = this._classStringForProperty(parsedPath);
 
           if (dasherizedClass) {
             // Ensure that it gets into the classNames array
@@ -42395,7 +42926,7 @@ enifed("ember-views/views/view",
             oldClass = dasherizedClass;
           }
 
-          this.registerObserver(this, parsedPath.path, observer);
+          parsedPath.stream.subscribe(observer, this);
           // Remove className so when the view is rerendered,
           // the className is added based on binding reevaluation
           this.one('willClearRender', function() {
@@ -42495,16 +43026,8 @@ enifed("ember-views/views/view",
         @param property
         @private
       */
-      _classStringForProperty: function(property) {
-        var parsedPath = View._parsePropertyPath(property);
-        var path = parsedPath.path;
-
-        var val = get(this, path);
-        if (val === undefined && isGlobalPath(path)) {
-          val = get(Ember.lookup, path);
-        }
-
-        return View._classStringForValue(path, val, parsedPath.className, parsedPath.falsyClassName);
+      _classStringForProperty: function(parsedPath) {
+        return View._classStringForValue(parsedPath.path, parsedPath.stream.value(), parsedPath.className, parsedPath.falsyClassName);
       },
 
       // ..........................................................
@@ -42940,6 +43463,17 @@ enifed("ember-views/views/view",
 
         // setup child views. be sure to clone the child views array first
         this._childViews = this._childViews.slice();
+        this._baseContext = undefined;
+        this._contextStream = undefined;
+        this._streamBindings = undefined;
+
+        if (!this._keywords) {
+          this._keywords = create(null);
+        }
+        this._keywords.view = new SimpleStream();
+        this._keywords._view = this;
+        this._keywords.controller = new KeyStream(this, 'controller');
+        this._setupKeywords();
 
         Ember.assert("Only arrays are allowed for 'classNameBindings'", typeOf(this.classNameBindings) === 'array');
         this.classNameBindings = emberA(this.classNameBindings.slice());
@@ -43022,11 +43556,9 @@ 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;
 
         if (!this._super()) { return; }
 
@@ -43207,22 +43739,78 @@ 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 scheduledObserver = this._wrapAsScheduled(observer);
 
         addObserver(root, path, target, scheduledObserver);
 
         this.one('willClearRender', function() {
           removeObserver(root, path, target, scheduledObserver);
         });
-      }
+      },
 
+      _wrapAsScheduled: function(fn) {
+        var view = this;
+        var stateCheckedFn = function() {
+          view.currentState.invokeObserver(this, fn);
+        };
+        var scheduledFn = function() {
+          run.scheduleOnce('render', this, stateCheckedFn);
+        };
+        return scheduledFn;
+      },
+
+      getStream: function(path) {
+        return this._getContextStream().get(path);
+      },
+
+      _getBindingForStream: function(path) {
+        if (this._streamBindings === undefined) {
+          this._streamBindings = create(null);
+          this.one('willDestroyElement', this, this._destroyStreamBindings);
+        }
+
+        if (this._streamBindings[path] !== undefined) {
+          return this._streamBindings[path];
+        } else {
+          var stream = this._getContextStream().get(path);
+          return this._streamBindings[path] = new StreamBinding(stream);
+        }
+      },
+
+      _destroyStreamBindings: function() {
+        var streamBindings = this._streamBindings;
+        for (var path in streamBindings) {
+          streamBindings[path].destroy();
+        }
+        this._streamBindings = undefined;
+      },
+
+      _getContextStream: function() {
+        if (this._contextStream === undefined) {
+          this._baseContext = new KeyStream(this, 'context');
+          this._contextStream = new ContextStream(this);
+          this.one('willDestroyElement', this, this._destroyContextStream);
+        }
+
+        return this._contextStream;
+      },
+
+      _destroyContextStream: function() {
+        this._baseContext.destroy();
+        this._baseContext = undefined;
+        this._contextStream.destroy();
+        this._contextStream = undefined;
+      },
+
+      _unsubscribeFromStreamBindings: function() {
+        for (var key in this._streamBindingSubscriptions) {
+          var streamBinding = this[key + 'Binding'];
+          var callback = this._streamBindingSubscriptions[key];
+          streamBinding.unsubscribe(callback);
+        }
+      }
     });
+
     deprecateProperty(View.prototype, 'state', '_state');
     deprecateProperty(View.prototype, 'states', '_states');
 
@@ -43253,10 +43841,6 @@ enifed("ember-views/views/view",
       // once the view has been inserted into the DOM, legal manipulations
       // are done on the DOM element.
 
-    function notifyMutationListeners() {
-      run.once(View, 'notifyMutationListeners');
-    }
-
     View.reopenClass({
 
       /**
@@ -43294,6 +43878,7 @@ enifed("ember-views/views/view",
         }
 
         return {
+          stream: undefined,
           path: propertyPath,
           classNames: classNames,
           className: (className === '') ? undefined : className,
@@ -46499,6 +47084,7 @@ enifed("router/transition",
 
       if (error) {
         this.promise = Promise.reject(error);
+        this.error = error;
         return;
       }
 
@@ -49742,4 +50328,4 @@ enifed("rsvp/utils",
   });
 requireModule("ember");
 
-})();
+})();
\ No newline at end of file
diff --git a/vendor/assets/javascripts/handlebars.js b/vendor/assets/javascripts/handlebars.js
index bec7085c510..f826bbfd387 100644
--- a/vendor/assets/javascripts/handlebars.js
+++ b/vendor/assets/javascripts/handlebars.js
@@ -1,8 +1,8 @@
 /*!
 
- handlebars v1.3.0
+ handlebars v2.0.0
 
-Copyright (C) 2011 by Yehuda Katz
+Copyright (C) 2011-2014 by Yehuda Katz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -25,7 +25,15 @@ THE SOFTWARE.
 @license
 */
 /* exported Handlebars */
-var Handlebars = (function() {
+(function (root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    define([], factory);
+  } else if (typeof exports === 'object') {
+    module.exports = factory();
+  } else {
+    root.Handlebars = root.Handlebars || factory();
+  }
+}(this, function () {
 // handlebars/safe-string.js
 var __module4__ = (function() {
   "use strict";
@@ -63,15 +71,19 @@ var __module3__ = (function(__dependency1__) {
   var possible = /[&<>"'`]/;
 
   function escapeChar(chr) {
-    return escape[chr] || "&amp;";
+    return escape[chr];
   }
 
-  function extend(obj, value) {
-    for(var key in value) {
-      if(Object.prototype.hasOwnProperty.call(value, key)) {
-        obj[key] = value[key];
+  function extend(obj /* , ...source */) {
+    for (var i = 1; i < arguments.length; i++) {
+      for (var key in arguments[i]) {
+        if (Object.prototype.hasOwnProperty.call(arguments[i], key)) {
+          obj[key] = arguments[i][key];
+        }
       }
     }
+
+    return obj;
   }
 
   __exports__.extend = extend;var toString = Object.prototype.toString;
@@ -82,6 +94,7 @@ var __module3__ = (function(__dependency1__) {
     return typeof value === 'function';
   };
   // fallback for older versions of Chrome and Safari
+  /* istanbul ignore next */
   if (isFunction(/x/)) {
     isFunction = function(value) {
       return typeof value === 'function' && toString.call(value) === '[object Function]';
@@ -89,6 +102,7 @@ var __module3__ = (function(__dependency1__) {
   }
   var isFunction;
   __exports__.isFunction = isFunction;
+  /* istanbul ignore next */
   var isArray = Array.isArray || function(value) {
     return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false;
   };
@@ -98,8 +112,10 @@ var __module3__ = (function(__dependency1__) {
     // don't escape SafeStrings, since they're already safe
     if (string instanceof SafeString) {
       return string.toString();
-    } else if (!string && string !== 0) {
+    } else if (string == null) {
       return "";
+    } else if (!string) {
+      return string + '';
     }
 
     // Force a string conversion as this will be done by the append regardless and
@@ -121,7 +137,11 @@ var __module3__ = (function(__dependency1__) {
     }
   }
 
-  __exports__.isEmpty = isEmpty;
+  __exports__.isEmpty = isEmpty;function appendContextPath(contextPath, id) {
+    return (contextPath ? contextPath + '.' : '') + id;
+  }
+
+  __exports__.appendContextPath = appendContextPath;
   return __exports__;
 })(__module4__);
 
@@ -166,14 +186,16 @@ var __module2__ = (function(__dependency1__, __dependency2__) {
   var Utils = __dependency1__;
   var Exception = __dependency2__;
 
-  var VERSION = "1.3.0";
-  __exports__.VERSION = VERSION;var COMPILER_REVISION = 4;
+  var VERSION = "2.0.0";
+  __exports__.VERSION = VERSION;var COMPILER_REVISION = 6;
   __exports__.COMPILER_REVISION = COMPILER_REVISION;
   var REVISION_CHANGES = {
     1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
     2: '== 1.0.0-rc.3',
     3: '== 1.0.0-rc.4',
-    4: '>= 1.0.0'
+    4: '== 1.x.x',
+    5: '== 2.0.0-alpha.x',
+    6: '>= 2.0.0-beta.1'
   };
   __exports__.REVISION_CHANGES = REVISION_CHANGES;
   var isArray = Utils.isArray,
@@ -194,38 +216,44 @@ var __module2__ = (function(__dependency1__, __dependency2__) {
     logger: logger,
     log: log,
 
-    registerHelper: function(name, fn, inverse) {
+    registerHelper: function(name, fn) {
       if (toString.call(name) === objectType) {
-        if (inverse || fn) { throw new Exception('Arg not supported with multiple helpers'); }
+        if (fn) { throw new Exception('Arg not supported with multiple helpers'); }
         Utils.extend(this.helpers, name);
       } else {
-        if (inverse) { fn.not = inverse; }
         this.helpers[name] = fn;
       }
     },
+    unregisterHelper: function(name) {
+      delete this.helpers[name];
+    },
 
-    registerPartial: function(name, str) {
+    registerPartial: function(name, partial) {
       if (toString.call(name) === objectType) {
         Utils.extend(this.partials,  name);
       } else {
-        this.partials[name] = str;
+        this.partials[name] = partial;
       }
+    },
+    unregisterPartial: function(name) {
+      delete this.partials[name];
     }
   };
 
   function registerDefaultHelpers(instance) {
-    instance.registerHelper('helperMissing', function(arg) {
-      if(arguments.length === 2) {
+    instance.registerHelper('helperMissing', function(/* [args, ]options */) {
+      if(arguments.length === 1) {
+        // A missing field in a {{foo}} constuct.
         return undefined;
       } else {
-        throw new Exception("Missing helper: '" + arg + "'");
+        // Someone is actually trying to call something, blow up.
+        throw new Exception("Missing helper: '" + arguments[arguments.length-1].name + "'");
       }
     });
 
     instance.registerHelper('blockHelperMissing', function(context, options) {
-      var inverse = options.inverse || function() {}, fn = options.fn;
-
-      if (isFunction(context)) { context = context.call(this); }
+      var inverse = options.inverse,
+          fn = options.fn;
 
       if(context === true) {
         return fn(this);
@@ -233,19 +261,38 @@ var __module2__ = (function(__dependency1__, __dependency2__) {
         return inverse(this);
       } else if (isArray(context)) {
         if(context.length > 0) {
+          if (options.ids) {
+            options.ids = [options.name];
+          }
+
           return instance.helpers.each(context, options);
         } else {
           return inverse(this);
         }
       } else {
-        return fn(context);
+        if (options.data && options.ids) {
+          var data = createFrame(options.data);
+          data.contextPath = Utils.appendContextPath(options.data.contextPath, options.name);
+          options = {data: data};
+        }
+
+        return fn(context, options);
       }
     });
 
     instance.registerHelper('each', function(context, options) {
+      if (!options) {
+        throw new Exception('Must pass iterator to #each');
+      }
+
       var fn = options.fn, inverse = options.inverse;
       var i = 0, ret = "", data;
 
+      var contextPath;
+      if (options.data && options.ids) {
+        contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]) + '.';
+      }
+
       if (isFunction(context)) { context = context.call(this); }
 
       if (options.data) {
@@ -259,16 +306,24 @@ var __module2__ = (function(__dependency1__, __dependency2__) {
               data.index = i;
               data.first = (i === 0);
               data.last  = (i === (context.length-1));
+
+              if (contextPath) {
+                data.contextPath = contextPath + i;
+              }
             }
             ret = ret + fn(context[i], { data: data });
           }
         } else {
           for(var key in context) {
             if(context.hasOwnProperty(key)) {
-              if(data) { 
-                data.key = key; 
+              if(data) {
+                data.key = key;
                 data.index = i;
                 data.first = (i === 0);
+
+                if (contextPath) {
+                  data.contextPath = contextPath + key;
+                }
               }
               ret = ret + fn(context[key], {data: data});
               i++;
@@ -304,12 +359,28 @@ var __module2__ = (function(__dependency1__, __dependency2__) {
     instance.registerHelper('with', function(context, options) {
       if (isFunction(context)) { context = context.call(this); }
 
-      if (!Utils.isEmpty(context)) return options.fn(context);
+      var fn = options.fn;
+
+      if (!Utils.isEmpty(context)) {
+        if (options.data && options.ids) {
+          var data = createFrame(options.data);
+          data.contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]);
+          options = {data:data};
+        }
+
+        return fn(context, options);
+      } else {
+        return options.inverse(this);
+      }
     });
 
-    instance.registerHelper('log', function(context, options) {
+    instance.registerHelper('log', function(message, options) {
       var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
-      instance.log(level, context);
+      instance.log(level, message);
+    });
+
+    instance.registerHelper('lookup', function(obj, field) {
+      return obj && obj[field];
     });
   }
 
@@ -324,22 +395,22 @@ var __module2__ = (function(__dependency1__, __dependency2__) {
     level: 3,
 
     // can be overridden in the host environment
-    log: function(level, obj) {
+    log: function(level, message) {
       if (logger.level <= level) {
         var method = logger.methodMap[level];
         if (typeof console !== 'undefined' && console[method]) {
-          console[method].call(console, obj);
+          console[method].call(console, message);
         }
       }
     }
   };
   __exports__.logger = logger;
-  function log(level, obj) { logger.log(level, obj); }
-
-  __exports__.log = log;var createFrame = function(object) {
-    var obj = {};
-    Utils.extend(obj, object);
-    return obj;
+  var log = logger.log;
+  __exports__.log = log;
+  var createFrame = function(object) {
+    var frame = Utils.extend({}, object);
+    frame._parent = object;
+    return frame;
   };
   __exports__.createFrame = createFrame;
   return __exports__;
@@ -353,6 +424,7 @@ var __module6__ = (function(__dependency1__, __dependency2__, __dependency3__) {
   var Exception = __dependency2__;
   var COMPILER_REVISION = __dependency3__.COMPILER_REVISION;
   var REVISION_CHANGES = __dependency3__.REVISION_CHANGES;
+  var createFrame = __dependency3__.createFrame;
 
   function checkRevision(compilerInfo) {
     var compilerRevision = compilerInfo && compilerInfo[0] || 1,
@@ -375,20 +447,43 @@ var __module6__ = (function(__dependency1__, __dependency2__, __dependency3__) {
   __exports__.checkRevision = checkRevision;// TODO: Remove this line and break up compilePartial
 
   function template(templateSpec, env) {
+    /* istanbul ignore next */
     if (!env) {
       throw new Exception("No environment passed to template");
     }
+    if (!templateSpec || !templateSpec.main) {
+      throw new Exception('Unknown template object: ' + typeof templateSpec);
+    }
 
     // Note: Using env.VM references rather than local var references throughout this section to allow
     // for external users to override these as psuedo-supported APIs.
-    var invokePartialWrapper = function(partial, name, context, helpers, partials, data) {
-      var result = env.VM.invokePartial.apply(this, arguments);
-      if (result != null) { return result; }
+    env.VM.checkRevision(templateSpec.compiler);
 
-      if (env.compile) {
-        var options = { helpers: helpers, partials: partials, data: data };
-        partials[name] = env.compile(partial, { data: data !== undefined }, env);
-        return partials[name](context, options);
+    var invokePartialWrapper = function(partial, indent, name, context, hash, helpers, partials, data, depths) {
+      if (hash) {
+        context = Utils.extend({}, context, hash);
+      }
+
+      var result = env.VM.invokePartial.call(this, partial, name, context, helpers, partials, data, depths);
+
+      if (result == null && env.compile) {
+        var options = { helpers: helpers, partials: partials, data: data, depths: depths };
+        partials[name] = env.compile(partial, { data: data !== undefined, compat: templateSpec.compat }, env);
+        result = partials[name](context, options);
+      }
+      if (result != null) {
+        if (indent) {
+          var lines = result.split('\n');
+          for (var i = 0, l = lines.length; i < l; i++) {
+            if (!lines[i] && i + 1 === l) {
+              break;
+            }
+
+            lines[i] = indent + lines[i];
+          }
+          result = lines.join('\n');
+        }
+        return result;
       } else {
         throw new Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
       }
@@ -396,84 +491,110 @@ var __module6__ = (function(__dependency1__, __dependency2__, __dependency3__) {
 
     // Just add water
     var container = {
+      lookup: function(depths, name) {
+        var len = depths.length;
+        for (var i = 0; i < len; i++) {
+          if (depths[i] && depths[i][name] != null) {
+            return depths[i][name];
+          }
+        }
+      },
+      lambda: function(current, context) {
+        return typeof current === 'function' ? current.call(context) : current;
+      },
+
       escapeExpression: Utils.escapeExpression,
       invokePartial: invokePartialWrapper,
+
+      fn: function(i) {
+        return templateSpec[i];
+      },
+
       programs: [],
-      program: function(i, fn, data) {
-        var programWrapper = this.programs[i];
-        if(data) {
-          programWrapper = program(i, fn, data);
+      program: function(i, data, depths) {
+        var programWrapper = this.programs[i],
+            fn = this.fn(i);
+        if (data || depths) {
+          programWrapper = program(this, i, fn, data, depths);
         } else if (!programWrapper) {
-          programWrapper = this.programs[i] = program(i, fn);
+          programWrapper = this.programs[i] = program(this, i, fn);
         }
         return programWrapper;
       },
+
+      data: function(data, depth) {
+        while (data && depth--) {
+          data = data._parent;
+        }
+        return data;
+      },
       merge: function(param, common) {
         var ret = param || common;
 
         if (param && common && (param !== common)) {
-          ret = {};
-          Utils.extend(ret, common);
-          Utils.extend(ret, param);
+          ret = Utils.extend({}, common, param);
         }
+
         return ret;
       },
-      programWithDepth: env.VM.programWithDepth,
+
       noop: env.VM.noop,
-      compilerInfo: null
+      compilerInfo: templateSpec.compiler
     };
 
-    return function(context, options) {
+    var ret = function(context, options) {
       options = options || {};
-      var namespace = options.partial ? options : env,
-          helpers,
-          partials;
+      var data = options.data;
 
-      if (!options.partial) {
-        helpers = options.helpers;
-        partials = options.partials;
+      ret._setup(options);
+      if (!options.partial && templateSpec.useData) {
+        data = initData(context, data);
       }
-      var result = templateSpec.call(
-            container,
-            namespace, context,
-            helpers,
-            partials,
-            options.data);
-
-      if (!options.partial) {
-        env.VM.checkRevision(container.compilerInfo);
+      var depths;
+      if (templateSpec.useDepths) {
+        depths = options.depths ? [context].concat(options.depths) : [context];
       }
 
-      return result;
+      return templateSpec.main.call(container, context, container.helpers, container.partials, data, depths);
     };
+    ret.isTop = true;
+
+    ret._setup = function(options) {
+      if (!options.partial) {
+        container.helpers = container.merge(options.helpers, env.helpers);
+
+        if (templateSpec.usePartial) {
+          container.partials = container.merge(options.partials, env.partials);
+        }
+      } else {
+        container.helpers = options.helpers;
+        container.partials = options.partials;
+      }
+    };
+
+    ret._child = function(i, data, depths) {
+      if (templateSpec.useDepths && !depths) {
+        throw new Exception('must pass parent depths');
+      }
+
+      return program(container, i, templateSpec[i], data, depths);
+    };
+    return ret;
   }
 
-  __exports__.template = template;function programWithDepth(i, fn, data /*, $depth */) {
-    var args = Array.prototype.slice.call(arguments, 3);
-
+  __exports__.template = template;function program(container, i, fn, data, depths) {
     var prog = function(context, options) {
       options = options || {};
 
-      return fn.apply(this, [context, options.data || data].concat(args));
+      return fn.call(container, context, container.helpers, container.partials, options.data || data, depths && [context].concat(depths));
     };
     prog.program = i;
-    prog.depth = args.length;
+    prog.depth = depths ? depths.length : 0;
     return prog;
   }
 
-  __exports__.programWithDepth = programWithDepth;function program(i, fn, data) {
-    var prog = function(context, options) {
-      options = options || {};
-
-      return fn(context, options.data || data);
-    };
-    prog.program = i;
-    prog.depth = 0;
-    return prog;
-  }
-
-  __exports__.program = program;function invokePartial(partial, name, context, helpers, partials, data) {
-    var options = { partial: true, helpers: helpers, partials: partials, data: data };
+  __exports__.program = program;function invokePartial(partial, name, context, helpers, partials, data, depths) {
+    var options = { partial: true, helpers: helpers, partials: partials, data: data, depths: depths };
 
     if(partial === undefined) {
       throw new Exception("The partial " + name + " could not be found");
@@ -484,7 +605,13 @@ var __module6__ = (function(__dependency1__, __dependency2__, __dependency3__) {
 
   __exports__.invokePartial = invokePartial;function noop() { return ""; }
 
-  __exports__.noop = noop;
+  __exports__.noop = noop;function initData(context, data) {
+    if (!data || !('root' in data)) {
+      data = data ? createFrame(data) : {};
+      data.root = context;
+    }
+    return data;
+  }
   return __exports__;
 })(__module3__, __module5__, __module2__);
 
@@ -510,6 +637,7 @@ var __module1__ = (function(__dependency1__, __dependency2__, __dependency3__, _
     hb.SafeString = SafeString;
     hb.Exception = Exception;
     hb.Utils = Utils;
+    hb.escapeExpression = Utils.escapeExpression;
 
     hb.VM = runtime;
     hb.template = function(spec) {
@@ -522,6 +650,8 @@ var __module1__ = (function(__dependency1__, __dependency2__, __dependency3__, _
   var Handlebars = create();
   Handlebars.create = create;
 
+  Handlebars['default'] = Handlebars;
+
   __exports__ = Handlebars;
   return __exports__;
 })(__module2__, __module4__, __module5__, __module3__, __module6__);
@@ -532,7 +662,7 @@ var __module7__ = (function(__dependency1__) {
   var __exports__;
   var Exception = __dependency1__;
 
-  function LocationInfo(locInfo){
+  function LocationInfo(locInfo) {
     locInfo = locInfo || {};
     this.firstLine   = locInfo.first_line;
     this.firstColumn = locInfo.first_column;
@@ -541,38 +671,11 @@ var __module7__ = (function(__dependency1__) {
   }
 
   var AST = {
-    ProgramNode: function(statements, inverseStrip, inverse, locInfo) {
-      var inverseLocationInfo, firstInverseNode;
-      if (arguments.length === 3) {
-        locInfo = inverse;
-        inverse = null;
-      } else if (arguments.length === 2) {
-        locInfo = inverseStrip;
-        inverseStrip = null;
-      }
-
+    ProgramNode: function(statements, strip, locInfo) {
       LocationInfo.call(this, locInfo);
       this.type = "program";
       this.statements = statements;
-      this.strip = {};
-
-      if(inverse) {
-        firstInverseNode = inverse[0];
-        if (firstInverseNode) {
-          inverseLocationInfo = {
-            first_line: firstInverseNode.firstLine,
-            last_line: firstInverseNode.lastLine,
-            last_column: firstInverseNode.lastColumn,
-            first_column: firstInverseNode.firstColumn
-          };
-          this.inverse = new AST.ProgramNode(inverse, inverseStrip, inverseLocationInfo);
-        } else {
-          this.inverse = new AST.ProgramNode(inverse, inverseStrip);
-        }
-        this.strip.right = inverseStrip.left;
-      } else if (inverseStrip) {
-        this.strip.left = inverseStrip.right;
-      }
+      this.strip = strip;
     },
 
     MustacheNode: function(rawParams, hash, open, strip, locInfo) {
@@ -596,8 +699,6 @@ var __module7__ = (function(__dependency1__) {
         this.sexpr = new AST.SexprNode(rawParams, hash);
       }
 
-      this.sexpr.isRoot = true;
-
       // Support old AST API that stored this info in MustacheNode
       this.id = this.sexpr.id;
       this.params = this.sexpr.params;
@@ -615,57 +716,63 @@ var __module7__ = (function(__dependency1__) {
       var id = this.id = rawParams[0];
       var params = this.params = rawParams.slice(1);
 
-      // a mustache is an eligible helper if:
-      // * its id is simple (a single part, not `this` or `..`)
-      var eligibleHelper = this.eligibleHelper = id.isSimple;
-
       // a mustache is definitely a helper if:
       // * it is an eligible helper, and
       // * it has at least one parameter or hash segment
-      this.isHelper = eligibleHelper && (params.length || hash);
+      this.isHelper = !!(params.length || hash);
+
+      // a mustache is an eligible helper if:
+      // * its id is simple (a single part, not `this` or `..`)
+      this.eligibleHelper = this.isHelper || id.isSimple;
 
       // if a mustache is an eligible helper but not a definite
       // helper, it is ambiguous, and will be resolved in a later
       // pass or at runtime.
     },
 
-    PartialNode: function(partialName, context, strip, locInfo) {
+    PartialNode: function(partialName, context, hash, strip, locInfo) {
       LocationInfo.call(this, locInfo);
       this.type         = "partial";
       this.partialName  = partialName;
       this.context      = context;
+      this.hash = hash;
       this.strip = strip;
+
+      this.strip.inlineStandalone = true;
     },
 
-    BlockNode: function(mustache, program, inverse, close, locInfo) {
+    BlockNode: function(mustache, program, inverse, strip, locInfo) {
       LocationInfo.call(this, locInfo);
 
-      if(mustache.sexpr.id.original !== close.path.original) {
-        throw new Exception(mustache.sexpr.id.original + " doesn't match " + close.path.original, this);
-      }
-
       this.type = 'block';
       this.mustache = mustache;
       this.program  = program;
       this.inverse  = inverse;
-
-      this.strip = {
-        left: mustache.strip.left,
-        right: close.strip.right
-      };
-
-      (program || inverse).strip.left = mustache.strip.right;
-      (inverse || program).strip.right = close.strip.left;
+      this.strip = strip;
 
       if (inverse && !program) {
         this.isInverse = true;
       }
     },
 
+    RawBlockNode: function(mustache, content, close, locInfo) {
+      LocationInfo.call(this, locInfo);
+
+      if (mustache.sexpr.id.original !== close) {
+        throw new Exception(mustache.sexpr.id.original + " doesn't match " + close, this);
+      }
+
+      content = new AST.ContentNode(content, locInfo);
+
+      this.type = 'block';
+      this.mustache = mustache;
+      this.program = new AST.ProgramNode([content], {}, locInfo);
+    },
+
     ContentNode: function(string, locInfo) {
       LocationInfo.call(this, locInfo);
       this.type = "content";
-      this.string = string;
+      this.original = this.string = string;
     },
 
     HashNode: function(pairs, locInfo) {
@@ -680,7 +787,8 @@ var __module7__ = (function(__dependency1__) {
 
       var original = "",
           dig = [],
-          depth = 0;
+          depth = 0,
+          depthString = '';
 
       for(var i=0,l=parts.length; i<l; i++) {
         var part = parts[i].part;
@@ -691,6 +799,7 @@ var __module7__ = (function(__dependency1__) {
             throw new Exception("Invalid path: " + original, this);
           } else if (part === "..") {
             depth++;
+            depthString += '../';
           } else {
             this.isScoped = true;
           }
@@ -703,6 +812,7 @@ var __module7__ = (function(__dependency1__) {
       this.parts    = dig;
       this.string   = dig.join('.');
       this.depth    = depth;
+      this.idName   = depthString + this.string;
 
       // an ID is simple if it only has one part, and that part is not
       // `..` or `this`.
@@ -721,6 +831,8 @@ var __module7__ = (function(__dependency1__) {
       LocationInfo.call(this, locInfo);
       this.type = "DATA";
       this.id = id;
+      this.stringModeValue = id.stringModeValue;
+      this.idName = '@' + id.stringModeValue;
     },
 
     StringNode: function(string, locInfo) {
@@ -731,12 +843,12 @@ var __module7__ = (function(__dependency1__) {
         this.stringModeValue = string;
     },
 
-    IntegerNode: function(integer, locInfo) {
+    NumberNode: function(number, locInfo) {
       LocationInfo.call(this, locInfo);
-      this.type = "INTEGER";
+      this.type = "NUMBER";
       this.original =
-        this.integer = integer;
-      this.stringModeValue = Number(integer);
+        this.number = number;
+      this.stringModeValue = Number(number);
     },
 
     BooleanNode: function(bool, locInfo) {
@@ -750,9 +862,14 @@ var __module7__ = (function(__dependency1__) {
       LocationInfo.call(this, locInfo);
       this.type = "comment";
       this.comment = comment;
+
+      this.strip = {
+        inlineStandalone: true
+      };
     }
   };
 
+
   // Must be exported as an object rather than the root of the module as the jison lexer
   // most modify the object to operate properly.
   __exports__ = AST;
@@ -764,109 +881,108 @@ var __module9__ = (function() {
   "use strict";
   var __exports__;
   /* jshint ignore:start */
+  /* istanbul ignore next */
   /* Jison generated parser */
   var handlebars = (function(){
   var parser = {trace: function trace() { },
   yy: {},
-  symbols_: {"error":2,"root":3,"statements":4,"EOF":5,"program":6,"simpleInverse":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"sexpr":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"CLOSE_UNESCAPED":24,"OPEN_PARTIAL":25,"partialName":26,"partial_option0":27,"sexpr_repetition0":28,"sexpr_option0":29,"dataName":30,"param":31,"STRING":32,"INTEGER":33,"BOOLEAN":34,"OPEN_SEXPR":35,"CLOSE_SEXPR":36,"hash":37,"hash_repetition_plus0":38,"hashSegment":39,"ID":40,"EQUALS":41,"DATA":42,"pathSegments":43,"SEP":44,"$accept":0,"$end":1},
-  terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"CLOSE_UNESCAPED",25:"OPEN_PARTIAL",32:"STRING",33:"INTEGER",34:"BOOLEAN",35:"OPEN_SEXPR",36:"CLOSE_SEXPR",40:"ID",41:"EQUALS",42:"DATA",44:"SEP"},
-  productions_: [0,[3,2],[3,1],[6,2],[6,3],[6,2],[6,1],[6,1],[6,0],[4,1],[4,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,4],[7,2],[17,3],[17,1],[31,1],[31,1],[31,1],[31,1],[31,1],[31,3],[37,1],[39,3],[26,1],[26,1],[26,1],[30,2],[21,1],[43,3],[43,1],[27,0],[27,1],[28,0],[28,2],[29,0],[29,1],[38,1],[38,2]],
+  symbols_: {"error":2,"root":3,"program":4,"EOF":5,"program_repetition0":6,"statement":7,"mustache":8,"block":9,"rawBlock":10,"partial":11,"CONTENT":12,"COMMENT":13,"openRawBlock":14,"END_RAW_BLOCK":15,"OPEN_RAW_BLOCK":16,"sexpr":17,"CLOSE_RAW_BLOCK":18,"openBlock":19,"block_option0":20,"closeBlock":21,"openInverse":22,"block_option1":23,"OPEN_BLOCK":24,"CLOSE":25,"OPEN_INVERSE":26,"inverseAndProgram":27,"INVERSE":28,"OPEN_ENDBLOCK":29,"path":30,"OPEN":31,"OPEN_UNESCAPED":32,"CLOSE_UNESCAPED":33,"OPEN_PARTIAL":34,"partialName":35,"param":36,"partial_option0":37,"partial_option1":38,"sexpr_repetition0":39,"sexpr_option0":40,"dataName":41,"STRING":42,"NUMBER":43,"BOOLEAN":44,"OPEN_SEXPR":45,"CLOSE_SEXPR":46,"hash":47,"hash_repetition_plus0":48,"hashSegment":49,"ID":50,"EQUALS":51,"DATA":52,"pathSegments":53,"SEP":54,"$accept":0,"$end":1},
+  terminals_: {2:"error",5:"EOF",12:"CONTENT",13:"COMMENT",15:"END_RAW_BLOCK",16:"OPEN_RAW_BLOCK",18:"CLOSE_RAW_BLOCK",24:"OPEN_BLOCK",25:"CLOSE",26:"OPEN_INVERSE",28:"INVERSE",29:"OPEN_ENDBLOCK",31:"OPEN",32:"OPEN_UNESCAPED",33:"CLOSE_UNESCAPED",34:"OPEN_PARTIAL",42:"STRING",43:"NUMBER",44:"BOOLEAN",45:"OPEN_SEXPR",46:"CLOSE_SEXPR",50:"ID",51:"EQUALS",52:"DATA",54:"SEP"},
+  productions_: [0,[3,2],[4,1],[7,1],[7,1],[7,1],[7,1],[7,1],[7,1],[10,3],[14,3],[9,4],[9,4],[19,3],[22,3],[27,2],[21,3],[8,3],[8,3],[11,5],[11,4],[17,3],[17,1],[36,1],[36,1],[36,1],[36,1],[36,1],[36,3],[47,1],[49,3],[35,1],[35,1],[35,1],[41,2],[30,1],[53,3],[53,1],[6,0],[6,2],[20,0],[20,1],[23,0],[23,1],[37,0],[37,1],[38,0],[38,1],[39,0],[39,2],[40,0],[40,1],[48,1],[48,2]],
   performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
 
   var $0 = $$.length - 1;
   switch (yystate) {
-  case 1: return new yy.ProgramNode($$[$0-1], this._$); 
+  case 1: yy.prepareProgram($$[$0-1].statements, true); return $$[$0-1]; 
   break;
-  case 2: return new yy.ProgramNode([], this._$); 
+  case 2:this.$ = new yy.ProgramNode(yy.prepareProgram($$[$0]), {}, this._$);
   break;
-  case 3:this.$ = new yy.ProgramNode([], $$[$0-1], $$[$0], this._$);
+  case 3:this.$ = $$[$0];
   break;
-  case 4:this.$ = new yy.ProgramNode($$[$0-2], $$[$0-1], $$[$0], this._$);
+  case 4:this.$ = $$[$0];
   break;
-  case 5:this.$ = new yy.ProgramNode($$[$0-1], $$[$0], [], this._$);
+  case 5:this.$ = $$[$0];
   break;
-  case 6:this.$ = new yy.ProgramNode($$[$0], this._$);
+  case 6:this.$ = $$[$0];
   break;
-  case 7:this.$ = new yy.ProgramNode([], this._$);
+  case 7:this.$ = new yy.ContentNode($$[$0], this._$);
   break;
-  case 8:this.$ = new yy.ProgramNode([], this._$);
+  case 8:this.$ = new yy.CommentNode($$[$0], this._$);
   break;
-  case 9:this.$ = [$$[$0]];
+  case 9:this.$ = new yy.RawBlockNode($$[$0-2], $$[$0-1], $$[$0], this._$);
   break;
-  case 10: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
+  case 10:this.$ = new yy.MustacheNode($$[$0-1], null, '', '', this._$);
   break;
-  case 11:this.$ = new yy.BlockNode($$[$0-2], $$[$0-1].inverse, $$[$0-1], $$[$0], this._$);
+  case 11:this.$ = yy.prepareBlock($$[$0-3], $$[$0-2], $$[$0-1], $$[$0], false, this._$);
   break;
-  case 12:this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0-1].inverse, $$[$0], this._$);
+  case 12:this.$ = yy.prepareBlock($$[$0-3], $$[$0-2], $$[$0-1], $$[$0], true, this._$);
   break;
-  case 13:this.$ = $$[$0];
+  case 13:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$);
   break;
-  case 14:this.$ = $$[$0];
+  case 14:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$);
   break;
-  case 15:this.$ = new yy.ContentNode($$[$0], this._$);
+  case 15:this.$ = { strip: yy.stripFlags($$[$0-1], $$[$0-1]), program: $$[$0] };
   break;
-  case 16:this.$ = new yy.CommentNode($$[$0], this._$);
+  case 16:this.$ = {path: $$[$0-1], strip: yy.stripFlags($$[$0-2], $$[$0])};
   break;
-  case 17:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], stripFlags($$[$0-2], $$[$0]), this._$);
+  case 17:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$);
   break;
-  case 18:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], stripFlags($$[$0-2], $$[$0]), this._$);
+  case 18:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], yy.stripFlags($$[$0-2], $$[$0]), this._$);
   break;
-  case 19:this.$ = {path: $$[$0-1], strip: stripFlags($$[$0-2], $$[$0])};
+  case 19:this.$ = new yy.PartialNode($$[$0-3], $$[$0-2], $$[$0-1], yy.stripFlags($$[$0-4], $$[$0]), this._$);
   break;
-  case 20:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], stripFlags($$[$0-2], $$[$0]), this._$);
+  case 20:this.$ = new yy.PartialNode($$[$0-2], undefined, $$[$0-1], yy.stripFlags($$[$0-3], $$[$0]), this._$);
   break;
-  case 21:this.$ = new yy.MustacheNode($$[$0-1], null, $$[$0-2], stripFlags($$[$0-2], $$[$0]), this._$);
+  case 21:this.$ = new yy.SexprNode([$$[$0-2]].concat($$[$0-1]), $$[$0], this._$);
   break;
-  case 22:this.$ = new yy.PartialNode($$[$0-2], $$[$0-1], stripFlags($$[$0-3], $$[$0]), this._$);
+  case 22:this.$ = new yy.SexprNode([$$[$0]], null, this._$);
   break;
-  case 23:this.$ = stripFlags($$[$0-1], $$[$0]);
+  case 23:this.$ = $$[$0];
   break;
-  case 24:this.$ = new yy.SexprNode([$$[$0-2]].concat($$[$0-1]), $$[$0], this._$);
+  case 24:this.$ = new yy.StringNode($$[$0], this._$);
   break;
-  case 25:this.$ = new yy.SexprNode([$$[$0]], null, this._$);
+  case 25:this.$ = new yy.NumberNode($$[$0], this._$);
   break;
-  case 26:this.$ = $$[$0];
+  case 26:this.$ = new yy.BooleanNode($$[$0], this._$);
   break;
-  case 27:this.$ = new yy.StringNode($$[$0], this._$);
+  case 27:this.$ = $$[$0];
   break;
-  case 28:this.$ = new yy.IntegerNode($$[$0], this._$);
+  case 28:$$[$0-1].isHelper = true; this.$ = $$[$0-1];
   break;
-  case 29:this.$ = new yy.BooleanNode($$[$0], this._$);
+  case 29:this.$ = new yy.HashNode($$[$0], this._$);
   break;
-  case 30:this.$ = $$[$0];
+  case 30:this.$ = [$$[$0-2], $$[$0]];
   break;
-  case 31:$$[$0-1].isHelper = true; this.$ = $$[$0-1];
+  case 31:this.$ = new yy.PartialNameNode($$[$0], this._$);
   break;
-  case 32:this.$ = new yy.HashNode($$[$0], this._$);
+  case 32:this.$ = new yy.PartialNameNode(new yy.StringNode($$[$0], this._$), this._$);
   break;
-  case 33:this.$ = [$$[$0-2], $$[$0]];
+  case 33:this.$ = new yy.PartialNameNode(new yy.NumberNode($$[$0], this._$));
   break;
-  case 34:this.$ = new yy.PartialNameNode($$[$0], this._$);
+  case 34:this.$ = new yy.DataNode($$[$0], this._$);
   break;
-  case 35:this.$ = new yy.PartialNameNode(new yy.StringNode($$[$0], this._$), this._$);
+  case 35:this.$ = new yy.IdNode($$[$0], this._$);
   break;
-  case 36:this.$ = new yy.PartialNameNode(new yy.IntegerNode($$[$0], this._$));
+  case 36: $$[$0-2].push({part: $$[$0], separator: $$[$0-1]}); this.$ = $$[$0-2]; 
   break;
-  case 37:this.$ = new yy.DataNode($$[$0], this._$);
+  case 37:this.$ = [{part: $$[$0]}];
   break;
-  case 38:this.$ = new yy.IdNode($$[$0], this._$);
+  case 38:this.$ = [];
   break;
-  case 39: $$[$0-2].push({part: $$[$0], separator: $$[$0-1]}); this.$ = $$[$0-2]; 
+  case 39:$$[$0-1].push($$[$0]);
   break;
-  case 40:this.$ = [{part: $$[$0]}];
+  case 48:this.$ = [];
   break;
-  case 43:this.$ = [];
+  case 49:$$[$0-1].push($$[$0]);
   break;
-  case 44:$$[$0-1].push($$[$0]);
+  case 52:this.$ = [$$[$0]];
   break;
-  case 47:this.$ = [$$[$0]];
-  break;
-  case 48:$$[$0-1].push($$[$0]);
+  case 53:$$[$0-1].push($$[$0]);
   break;
   }
   },
-  table: [{3:1,4:2,5:[1,3],8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],25:[1,15]},{1:[3]},{5:[1,16],8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],25:[1,15]},{1:[2,2]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],25:[2,9]},{4:20,6:18,7:19,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,8],22:[1,13],23:[1,14],25:[1,15]},{4:20,6:22,7:19,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,8],22:[1,13],23:[1,14],25:[1,15]},{5:[2,13],14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],25:[2,13]},{5:[2,14],14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],25:[2,14]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],25:[2,15]},{5:[2,16],14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],25:[2,16]},{17:23,21:24,30:25,40:[1,28],42:[1,27],43:26},{17:29,21:24,30:25,40:[1,28],42:[1,27],43:26},{17:30,21:24,30:25,40:[1,28],42:[1,27],43:26},{17:31,21:24,30:25,40:[1,28],42:[1,27],43:26},{21:33,26:32,32:[1,34],33:[1,35],40:[1,28],43:26},{1:[2,1]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],25:[2,10]},{10:36,20:[1,37]},{4:38,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,7],22:[1,13],23:[1,14],25:[1,15]},{7:39,8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,6],22:[1,13],23:[1,14],25:[1,15]},{17:23,18:[1,40],21:24,30:25,40:[1,28],42:[1,27],43:26},{10:41,20:[1,37]},{18:[1,42]},{18:[2,43],24:[2,43],28:43,32:[2,43],33:[2,43],34:[2,43],35:[2,43],36:[2,43],40:[2,43],42:[2,43]},{18:[2,25],24:[2,25],36:[2,25]},{18:[2,38],24:[2,38],32:[2,38],33:[2,38],34:[2,38],35:[2,38],36:[2,38],40:[2,38],42:[2,38],44:[1,44]},{21:45,40:[1,28],43:26},{18:[2,40],24:[2,40],32:[2,40],33:[2,40],34:[2,40],35:[2,40],36:[2,40],40:[2,40],42:[2,40],44:[2,40]},{18:[1,46]},{18:[1,47]},{24:[1,48]},{18:[2,41],21:50,27:49,40:[1,28],43:26},{18:[2,34],40:[2,34]},{18:[2,35],40:[2,35]},{18:[2,36],40:[2,36]},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],25:[2,11]},{21:51,40:[1,28],43:26},{8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,3],22:[1,13],23:[1,14],25:[1,15]},{4:52,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,5],22:[1,13],23:[1,14],25:[1,15]},{14:[2,23],15:[2,23],16:[2,23],19:[2,23],20:[2,23],22:[2,23],23:[2,23],25:[2,23]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],25:[2,12]},{14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],25:[2,18]},{18:[2,45],21:56,24:[2,45],29:53,30:60,31:54,32:[1,57],33:[1,58],34:[1,59],35:[1,61],36:[2,45],37:55,38:62,39:63,40:[1,64],42:[1,27],43:26},{40:[1,65]},{18:[2,37],24:[2,37],32:[2,37],33:[2,37],34:[2,37],35:[2,37],36:[2,37],40:[2,37],42:[2,37]},{14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],25:[2,17]},{5:[2,20],14:[2,20],15:[2,20],16:[2,20],19:[2,20],20:[2,20],22:[2,20],23:[2,20],25:[2,20]},{5:[2,21],14:[2,21],15:[2,21],16:[2,21],19:[2,21],20:[2,21],22:[2,21],23:[2,21],25:[2,21]},{18:[1,66]},{18:[2,42]},{18:[1,67]},{8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],25:[1,15]},{18:[2,24],24:[2,24],36:[2,24]},{18:[2,44],24:[2,44],32:[2,44],33:[2,44],34:[2,44],35:[2,44],36:[2,44],40:[2,44],42:[2,44]},{18:[2,46],24:[2,46],36:[2,46]},{18:[2,26],24:[2,26],32:[2,26],33:[2,26],34:[2,26],35:[2,26],36:[2,26],40:[2,26],42:[2,26]},{18:[2,27],24:[2,27],32:[2,27],33:[2,27],34:[2,27],35:[2,27],36:[2,27],40:[2,27],42:[2,27]},{18:[2,28],24:[2,28],32:[2,28],33:[2,28],34:[2,28],35:[2,28],36:[2,28],40:[2,28],42:[2,28]},{18:[2,29],24:[2,29],32:[2,29],33:[2,29],34:[2,29],35:[2,29],36:[2,29],40:[2,29],42:[2,29]},{18:[2,30],24:[2,30],32:[2,30],33:[2,30],34:[2,30],35:[2,30],36:[2,30],40:[2,30],42:[2,30]},{17:68,21:24,30:25,40:[1,28],42:[1,27],43:26},{18:[2,32],24:[2,32],36:[2,32],39:69,40:[1,70]},{18:[2,47],24:[2,47],36:[2,47],40:[2,47]},{18:[2,40],24:[2,40],32:[2,40],33:[2,40],34:[2,40],35:[2,40],36:[2,40],40:[2,40],41:[1,71],42:[2,40],44:[2,40]},{18:[2,39],24:[2,39],32:[2,39],33:[2,39],34:[2,39],35:[2,39],36:[2,39],40:[2,39],42:[2,39],44:[2,39]},{5:[2,22],14:[2,22],15:[2,22],16:[2,22],19:[2,22],20:[2,22],22:[2,22],23:[2,22],25:[2,22]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],25:[2,19]},{36:[1,72]},{18:[2,48],24:[2,48],36:[2,48],40:[2,48]},{41:[1,71]},{21:56,30:60,31:73,32:[1,57],33:[1,58],34:[1,59],35:[1,61],40:[1,28],42:[1,27],43:26},{18:[2,31],24:[2,31],32:[2,31],33:[2,31],34:[2,31],35:[2,31],36:[2,31],40:[2,31],42:[2,31]},{18:[2,33],24:[2,33],36:[2,33],40:[2,33]}],
-  defaultActions: {3:[2,2],16:[2,1],50:[2,42]},
+  table: [{3:1,4:2,5:[2,38],6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],31:[2,38],32:[2,38],34:[2,38]},{1:[3]},{5:[1,4]},{5:[2,2],7:5,8:6,9:7,10:8,11:9,12:[1,10],13:[1,11],14:16,16:[1,20],19:14,22:15,24:[1,18],26:[1,19],28:[2,2],29:[2,2],31:[1,12],32:[1,13],34:[1,17]},{1:[2,1]},{5:[2,39],12:[2,39],13:[2,39],16:[2,39],24:[2,39],26:[2,39],28:[2,39],29:[2,39],31:[2,39],32:[2,39],34:[2,39]},{5:[2,3],12:[2,3],13:[2,3],16:[2,3],24:[2,3],26:[2,3],28:[2,3],29:[2,3],31:[2,3],32:[2,3],34:[2,3]},{5:[2,4],12:[2,4],13:[2,4],16:[2,4],24:[2,4],26:[2,4],28:[2,4],29:[2,4],31:[2,4],32:[2,4],34:[2,4]},{5:[2,5],12:[2,5],13:[2,5],16:[2,5],24:[2,5],26:[2,5],28:[2,5],29:[2,5],31:[2,5],32:[2,5],34:[2,5]},{5:[2,6],12:[2,6],13:[2,6],16:[2,6],24:[2,6],26:[2,6],28:[2,6],29:[2,6],31:[2,6],32:[2,6],34:[2,6]},{5:[2,7],12:[2,7],13:[2,7],16:[2,7],24:[2,7],26:[2,7],28:[2,7],29:[2,7],31:[2,7],32:[2,7],34:[2,7]},{5:[2,8],12:[2,8],13:[2,8],16:[2,8],24:[2,8],26:[2,8],28:[2,8],29:[2,8],31:[2,8],32:[2,8],34:[2,8]},{17:21,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:27,30:22,41:23,50:[1,26],52:[1,25],53:24},{4:28,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],28:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{4:29,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],28:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{12:[1,30]},{30:32,35:31,42:[1,33],43:[1,34],50:[1,26],53:24},{17:35,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:36,30:22,41:23,50:[1,26],52:[1,25],53:24},{17:37,30:22,41:23,50:[1,26],52:[1,25],53:24},{25:[1,38]},{18:[2,48],25:[2,48],33:[2,48],39:39,42:[2,48],43:[2,48],44:[2,48],45:[2,48],46:[2,48],50:[2,48],52:[2,48]},{18:[2,22],25:[2,22],33:[2,22],46:[2,22]},{18:[2,35],25:[2,35],33:[2,35],42:[2,35],43:[2,35],44:[2,35],45:[2,35],46:[2,35],50:[2,35],52:[2,35],54:[1,40]},{30:41,50:[1,26],53:24},{18:[2,37],25:[2,37],33:[2,37],42:[2,37],43:[2,37],44:[2,37],45:[2,37],46:[2,37],50:[2,37],52:[2,37],54:[2,37]},{33:[1,42]},{20:43,27:44,28:[1,45],29:[2,40]},{23:46,27:47,28:[1,45],29:[2,42]},{15:[1,48]},{25:[2,46],30:51,36:49,38:50,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],47:57,48:58,49:60,50:[1,59],52:[1,25],53:24},{25:[2,31],42:[2,31],43:[2,31],44:[2,31],45:[2,31],50:[2,31],52:[2,31]},{25:[2,32],42:[2,32],43:[2,32],44:[2,32],45:[2,32],50:[2,32],52:[2,32]},{25:[2,33],42:[2,33],43:[2,33],44:[2,33],45:[2,33],50:[2,33],52:[2,33]},{25:[1,61]},{25:[1,62]},{18:[1,63]},{5:[2,17],12:[2,17],13:[2,17],16:[2,17],24:[2,17],26:[2,17],28:[2,17],29:[2,17],31:[2,17],32:[2,17],34:[2,17]},{18:[2,50],25:[2,50],30:51,33:[2,50],36:65,40:64,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],46:[2,50],47:66,48:58,49:60,50:[1,59],52:[1,25],53:24},{50:[1,67]},{18:[2,34],25:[2,34],33:[2,34],42:[2,34],43:[2,34],44:[2,34],45:[2,34],46:[2,34],50:[2,34],52:[2,34]},{5:[2,18],12:[2,18],13:[2,18],16:[2,18],24:[2,18],26:[2,18],28:[2,18],29:[2,18],31:[2,18],32:[2,18],34:[2,18]},{21:68,29:[1,69]},{29:[2,41]},{4:70,6:3,12:[2,38],13:[2,38],16:[2,38],24:[2,38],26:[2,38],29:[2,38],31:[2,38],32:[2,38],34:[2,38]},{21:71,29:[1,69]},{29:[2,43]},{5:[2,9],12:[2,9],13:[2,9],16:[2,9],24:[2,9],26:[2,9],28:[2,9],29:[2,9],31:[2,9],32:[2,9],34:[2,9]},{25:[2,44],37:72,47:73,48:58,49:60,50:[1,74]},{25:[1,75]},{18:[2,23],25:[2,23],33:[2,23],42:[2,23],43:[2,23],44:[2,23],45:[2,23],46:[2,23],50:[2,23],52:[2,23]},{18:[2,24],25:[2,24],33:[2,24],42:[2,24],43:[2,24],44:[2,24],45:[2,24],46:[2,24],50:[2,24],52:[2,24]},{18:[2,25],25:[2,25],33:[2,25],42:[2,25],43:[2,25],44:[2,25],45:[2,25],46:[2,25],50:[2,25],52:[2,25]},{18:[2,26],25:[2,26],33:[2,26],42:[2,26],43:[2,26],44:[2,26],45:[2,26],46:[2,26],50:[2,26],52:[2,26]},{18:[2,27],25:[2,27],33:[2,27],42:[2,27],43:[2,27],44:[2,27],45:[2,27],46:[2,27],50:[2,27],52:[2,27]},{17:76,30:22,41:23,50:[1,26],52:[1,25],53:24},{25:[2,47]},{18:[2,29],25:[2,29],33:[2,29],46:[2,29],49:77,50:[1,74]},{18:[2,37],25:[2,37],33:[2,37],42:[2,37],43:[2,37],44:[2,37],45:[2,37],46:[2,37],50:[2,37],51:[1,78],52:[2,37],54:[2,37]},{18:[2,52],25:[2,52],33:[2,52],46:[2,52],50:[2,52]},{12:[2,13],13:[2,13],16:[2,13],24:[2,13],26:[2,13],28:[2,13],29:[2,13],31:[2,13],32:[2,13],34:[2,13]},{12:[2,14],13:[2,14],16:[2,14],24:[2,14],26:[2,14],28:[2,14],29:[2,14],31:[2,14],32:[2,14],34:[2,14]},{12:[2,10]},{18:[2,21],25:[2,21],33:[2,21],46:[2,21]},{18:[2,49],25:[2,49],33:[2,49],42:[2,49],43:[2,49],44:[2,49],45:[2,49],46:[2,49],50:[2,49],52:[2,49]},{18:[2,51],25:[2,51],33:[2,51],46:[2,51]},{18:[2,36],25:[2,36],33:[2,36],42:[2,36],43:[2,36],44:[2,36],45:[2,36],46:[2,36],50:[2,36],52:[2,36],54:[2,36]},{5:[2,11],12:[2,11],13:[2,11],16:[2,11],24:[2,11],26:[2,11],28:[2,11],29:[2,11],31:[2,11],32:[2,11],34:[2,11]},{30:79,50:[1,26],53:24},{29:[2,15]},{5:[2,12],12:[2,12],13:[2,12],16:[2,12],24:[2,12],26:[2,12],28:[2,12],29:[2,12],31:[2,12],32:[2,12],34:[2,12]},{25:[1,80]},{25:[2,45]},{51:[1,78]},{5:[2,20],12:[2,20],13:[2,20],16:[2,20],24:[2,20],26:[2,20],28:[2,20],29:[2,20],31:[2,20],32:[2,20],34:[2,20]},{46:[1,81]},{18:[2,53],25:[2,53],33:[2,53],46:[2,53],50:[2,53]},{30:51,36:82,41:55,42:[1,52],43:[1,53],44:[1,54],45:[1,56],50:[1,26],52:[1,25],53:24},{25:[1,83]},{5:[2,19],12:[2,19],13:[2,19],16:[2,19],24:[2,19],26:[2,19],28:[2,19],29:[2,19],31:[2,19],32:[2,19],34:[2,19]},{18:[2,28],25:[2,28],33:[2,28],42:[2,28],43:[2,28],44:[2,28],45:[2,28],46:[2,28],50:[2,28],52:[2,28]},{18:[2,30],25:[2,30],33:[2,30],46:[2,30],50:[2,30]},{5:[2,16],12:[2,16],13:[2,16],16:[2,16],24:[2,16],26:[2,16],28:[2,16],29:[2,16],31:[2,16],32:[2,16],34:[2,16]}],
+  defaultActions: {4:[2,1],44:[2,41],47:[2,43],57:[2,47],63:[2,10],70:[2,15],73:[2,45]},
   parseError: function parseError(str, hash) {
       throw new Error(str);
   },
@@ -974,15 +1090,6 @@ var __module9__ = (function() {
       return true;
   }
   };
-
-
-  function stripFlags(open, close) {
-    return {
-      left: open.charAt(2) === '~',
-      right: close.charAt(0) === '~' || close.charAt(1) === '~'
-    };
-  }
-
   /* Jison generated lexer */
   var lexer = (function(){
   var lexer = ({EOF:1,
@@ -1172,80 +1279,100 @@ var __module9__ = (function() {
                                      } else {
                                        this.begin("mu");
                                      }
-                                     if(yy_.yytext) return 14;
+                                     if(yy_.yytext) return 12;
                                    
   break;
-  case 1:return 14;
+  case 1:return 12;
   break;
   case 2:
                                      this.popState();
-                                     return 14;
+                                     return 12;
                                    
   break;
-  case 3:strip(0,4); this.popState(); return 15;
+  case 3:
+                                    yy_.yytext = yy_.yytext.substr(5, yy_.yyleng-9);
+                                    this.popState();
+                                    return 15;
+                                   
   break;
-  case 4:return 35;
+  case 4: return 12; 
   break;
-  case 5:return 36;
+  case 5:strip(0,4); this.popState(); return 13;
   break;
-  case 6:return 25;
+  case 6:return 45;
   break;
-  case 7:return 16;
+  case 7:return 46;
   break;
-  case 8:return 20;
+  case 8: return 16; 
   break;
-  case 9:return 19;
+  case 9:
+                                    this.popState();
+                                    this.begin('raw');
+                                    return 18;
+                                   
   break;
-  case 10:return 19;
+  case 10:return 34;
   break;
-  case 11:return 23;
+  case 11:return 24;
   break;
-  case 12:return 22;
+  case 12:return 29;
   break;
-  case 13:this.popState(); this.begin('com');
+  case 13:this.popState(); return 28;
   break;
-  case 14:strip(3,5); this.popState(); return 15;
+  case 14:this.popState(); return 28;
   break;
-  case 15:return 22;
+  case 15:return 26;
   break;
-  case 16:return 41;
+  case 16:return 26;
   break;
-  case 17:return 40;
+  case 17:return 32;
   break;
-  case 18:return 40;
+  case 18:return 31;
   break;
-  case 19:return 44;
+  case 19:this.popState(); this.begin('com');
   break;
-  case 20:// ignore whitespace
+  case 20:strip(3,5); this.popState(); return 13;
   break;
-  case 21:this.popState(); return 24;
+  case 21:return 31;
   break;
-  case 22:this.popState(); return 18;
+  case 22:return 51;
   break;
-  case 23:yy_.yytext = strip(1,2).replace(/\\"/g,'"'); return 32;
+  case 23:return 50;
   break;
-  case 24:yy_.yytext = strip(1,2).replace(/\\'/g,"'"); return 32;
+  case 24:return 50;
   break;
-  case 25:return 42;
+  case 25:return 54;
   break;
-  case 26:return 34;
+  case 26:// ignore whitespace
   break;
-  case 27:return 34;
+  case 27:this.popState(); return 33;
   break;
-  case 28:return 33;
+  case 28:this.popState(); return 25;
   break;
-  case 29:return 40;
+  case 29:yy_.yytext = strip(1,2).replace(/\\"/g,'"'); return 42;
   break;
-  case 30:yy_.yytext = strip(1,2); return 40;
+  case 30:yy_.yytext = strip(1,2).replace(/\\'/g,"'"); return 42;
   break;
-  case 31:return 'INVALID';
+  case 31:return 52;
   break;
-  case 32:return 5;
+  case 32:return 44;
+  break;
+  case 33:return 44;
+  break;
+  case 34:return 43;
+  break;
+  case 35:return 50;
+  break;
+  case 36:yy_.yytext = strip(1,2); return 50;
+  break;
+  case 37:return 'INVALID';
+  break;
+  case 38:return 5;
   break;
   }
   };
-  lexer.rules = [/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|\\\{\{|\\\\\{\{|$)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\()/,/^(?:\))/,/^(?:\{\{(~)?>)/,/^(?:\{\{(~)?#)/,/^(?:\{\{(~)?\/)/,/^(?:\{\{(~)?\^)/,/^(?:\{\{(~)?\s*else\b)/,/^(?:\{\{(~)?\{)/,/^(?:\{\{(~)?&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{(~)?)/,/^(?:=)/,/^(?:\.\.)/,/^(?:\.(?=([=~}\s\/.)])))/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}(~)?\}\})/,/^(?:(~)?\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=([~}\s)])))/,/^(?:false(?=([~}\s)])))/,/^(?:-?[0-9]+(?=([~}\s)])))/,/^(?:([^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=([=~}\s\/.)]))))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/];
-  lexer.conditions = {"mu":{"rules":[4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32],"inclusive":false},"emu":{"rules":[2],"inclusive":false},"com":{"rules":[3],"inclusive":false},"INITIAL":{"rules":[0,1,32],"inclusive":true}};
+  lexer.rules = [/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|\\\{\{|\\\\\{\{|$)))/,/^(?:\{\{\{\{\/[^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=[=}\s\/.])\}\}\}\})/,/^(?:[^\x00]*?(?=(\{\{\{\{\/)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\()/,/^(?:\))/,/^(?:\{\{\{\{)/,/^(?:\}\}\}\})/,/^(?:\{\{(~)?>)/,/^(?:\{\{(~)?#)/,/^(?:\{\{(~)?\/)/,/^(?:\{\{(~)?\^\s*(~)?\}\})/,/^(?:\{\{(~)?\s*else\s*(~)?\}\})/,/^(?:\{\{(~)?\^)/,/^(?:\{\{(~)?\s*else\b)/,/^(?:\{\{(~)?\{)/,/^(?:\{\{(~)?&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{(~)?)/,/^(?:=)/,/^(?:\.\.)/,/^(?:\.(?=([=~}\s\/.)])))/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}(~)?\}\})/,/^(?:(~)?\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=([~}\s)])))/,/^(?:false(?=([~}\s)])))/,/^(?:-?[0-9]+(?:\.[0-9]+)?(?=([~}\s)])))/,/^(?:([^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=([=~}\s\/.)]))))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/];
+  lexer.conditions = {"mu":{"rules":[6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38],"inclusive":false},"emu":{"rules":[2],"inclusive":false},"com":{"rules":[5],"inclusive":false},"raw":{"rules":[3,4],"inclusive":false},"INITIAL":{"rules":[0,1,38],"inclusive":true}};
   return lexer;})()
   parser.lexer = lexer;
   function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser;
@@ -1255,32 +1382,234 @@ var __module9__ = (function() {
   return __exports__;
 })();
 
+// handlebars/compiler/helpers.js
+var __module10__ = (function(__dependency1__) {
+  "use strict";
+  var __exports__ = {};
+  var Exception = __dependency1__;
+
+  function stripFlags(open, close) {
+    return {
+      left: open.charAt(2) === '~',
+      right: close.charAt(close.length-3) === '~'
+    };
+  }
+
+  __exports__.stripFlags = stripFlags;
+  function prepareBlock(mustache, program, inverseAndProgram, close, inverted, locInfo) {
+    /*jshint -W040 */
+    if (mustache.sexpr.id.original !== close.path.original) {
+      throw new Exception(mustache.sexpr.id.original + ' doesn\'t match ' + close.path.original, mustache);
+    }
+
+    var inverse = inverseAndProgram && inverseAndProgram.program;
+
+    var strip = {
+      left: mustache.strip.left,
+      right: close.strip.right,
+
+      // Determine the standalone candiacy. Basically flag our content as being possibly standalone
+      // so our parent can determine if we actually are standalone
+      openStandalone: isNextWhitespace(program.statements),
+      closeStandalone: isPrevWhitespace((inverse || program).statements)
+    };
+
+    if (mustache.strip.right) {
+      omitRight(program.statements, null, true);
+    }
+
+    if (inverse) {
+      var inverseStrip = inverseAndProgram.strip;
+
+      if (inverseStrip.left) {
+        omitLeft(program.statements, null, true);
+      }
+      if (inverseStrip.right) {
+        omitRight(inverse.statements, null, true);
+      }
+      if (close.strip.left) {
+        omitLeft(inverse.statements, null, true);
+      }
+
+      // Find standalone else statments
+      if (isPrevWhitespace(program.statements)
+          && isNextWhitespace(inverse.statements)) {
+
+        omitLeft(program.statements);
+        omitRight(inverse.statements);
+      }
+    } else {
+      if (close.strip.left) {
+        omitLeft(program.statements, null, true);
+      }
+    }
+
+    if (inverted) {
+      return new this.BlockNode(mustache, inverse, program, strip, locInfo);
+    } else {
+      return new this.BlockNode(mustache, program, inverse, strip, locInfo);
+    }
+  }
+
+  __exports__.prepareBlock = prepareBlock;
+  function prepareProgram(statements, isRoot) {
+    for (var i = 0, l = statements.length; i < l; i++) {
+      var current = statements[i],
+          strip = current.strip;
+
+      if (!strip) {
+        continue;
+      }
+
+      var _isPrevWhitespace = isPrevWhitespace(statements, i, isRoot, current.type === 'partial'),
+          _isNextWhitespace = isNextWhitespace(statements, i, isRoot),
+
+          openStandalone = strip.openStandalone && _isPrevWhitespace,
+          closeStandalone = strip.closeStandalone && _isNextWhitespace,
+          inlineStandalone = strip.inlineStandalone && _isPrevWhitespace && _isNextWhitespace;
+
+      if (strip.right) {
+        omitRight(statements, i, true);
+      }
+      if (strip.left) {
+        omitLeft(statements, i, true);
+      }
+
+      if (inlineStandalone) {
+        omitRight(statements, i);
+
+        if (omitLeft(statements, i)) {
+          // If we are on a standalone node, save the indent info for partials
+          if (current.type === 'partial') {
+            current.indent = (/([ \t]+$)/).exec(statements[i-1].original) ? RegExp.$1 : '';
+          }
+        }
+      }
+      if (openStandalone) {
+        omitRight((current.program || current.inverse).statements);
+
+        // Strip out the previous content node if it's whitespace only
+        omitLeft(statements, i);
+      }
+      if (closeStandalone) {
+        // Always strip the next node
+        omitRight(statements, i);
+
+        omitLeft((current.inverse || current.program).statements);
+      }
+    }
+
+    return statements;
+  }
+
+  __exports__.prepareProgram = prepareProgram;function isPrevWhitespace(statements, i, isRoot) {
+    if (i === undefined) {
+      i = statements.length;
+    }
+
+    // Nodes that end with newlines are considered whitespace (but are special
+    // cased for strip operations)
+    var prev = statements[i-1],
+        sibling = statements[i-2];
+    if (!prev) {
+      return isRoot;
+    }
+
+    if (prev.type === 'content') {
+      return (sibling || !isRoot ? (/\r?\n\s*?$/) : (/(^|\r?\n)\s*?$/)).test(prev.original);
+    }
+  }
+  function isNextWhitespace(statements, i, isRoot) {
+    if (i === undefined) {
+      i = -1;
+    }
+
+    var next = statements[i+1],
+        sibling = statements[i+2];
+    if (!next) {
+      return isRoot;
+    }
+
+    if (next.type === 'content') {
+      return (sibling || !isRoot ? (/^\s*?\r?\n/) : (/^\s*?(\r?\n|$)/)).test(next.original);
+    }
+  }
+
+  // Marks the node to the right of the position as omitted.
+  // I.e. {{foo}}' ' will mark the ' ' node as omitted.
+  //
+  // If i is undefined, then the first child will be marked as such.
+  //
+  // If mulitple is truthy then all whitespace will be stripped out until non-whitespace
+  // content is met.
+  function omitRight(statements, i, multiple) {
+    var current = statements[i == null ? 0 : i + 1];
+    if (!current || current.type !== 'content' || (!multiple && current.rightStripped)) {
+      return;
+    }
+
+    var original = current.string;
+    current.string = current.string.replace(multiple ? (/^\s+/) : (/^[ \t]*\r?\n?/), '');
+    current.rightStripped = current.string !== original;
+  }
+
+  // Marks the node to the left of the position as omitted.
+  // I.e. ' '{{foo}} will mark the ' ' node as omitted.
+  //
+  // If i is undefined then the last child will be marked as such.
+  //
+  // If mulitple is truthy then all whitespace will be stripped out until non-whitespace
+  // content is met.
+  function omitLeft(statements, i, multiple) {
+    var current = statements[i == null ? statements.length - 1 : i - 1];
+    if (!current || current.type !== 'content' || (!multiple && current.leftStripped)) {
+      return;
+    }
+
+    // We omit the last node if it's whitespace only and not preceeded by a non-content node.
+    var original = current.string;
+    current.string = current.string.replace(multiple ? (/\s+$/) : (/[ \t]+$/), '');
+    current.leftStripped = current.string !== original;
+    return current.leftStripped;
+  }
+  return __exports__;
+})(__module5__);
+
 // handlebars/compiler/base.js
-var __module8__ = (function(__dependency1__, __dependency2__) {
+var __module8__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
   "use strict";
   var __exports__ = {};
   var parser = __dependency1__;
   var AST = __dependency2__;
+  var Helpers = __dependency3__;
+  var extend = __dependency4__.extend;
 
   __exports__.parser = parser;
 
+  var yy = {};
+  extend(yy, Helpers, AST);
+
   function parse(input) {
     // Just return if an already-compile AST was passed in.
-    if(input.constructor === AST.ProgramNode) { return input; }
+    if (input.constructor === AST.ProgramNode) { return input; }
+
+    parser.yy = yy;
 
-    parser.yy = AST;
     return parser.parse(input);
   }
 
   __exports__.parse = parse;
   return __exports__;
-})(__module9__, __module7__);
+})(__module9__, __module7__, __module10__, __module3__);
 
 // handlebars/compiler/compiler.js
-var __module10__ = (function(__dependency1__) {
+var __module11__ = (function(__dependency1__, __dependency2__) {
   "use strict";
   var __exports__ = {};
   var Exception = __dependency1__;
+  var isArray = __dependency2__.isArray;
+
+  var slice = [].slice;
 
   function Compiler() {}
 
@@ -1292,30 +1621,6 @@ var __module10__ = (function(__dependency1__) {
   Compiler.prototype = {
     compiler: Compiler,
 
-    disassemble: function() {
-      var opcodes = this.opcodes, opcode, out = [], params, param;
-
-      for (var i=0, l=opcodes.length; i<l; i++) {
-        opcode = opcodes[i];
-
-        if (opcode.opcode === 'DECLARE') {
-          out.push("DECLARE " + opcode.name + "=" + opcode.value);
-        } else {
-          params = [];
-          for (var j=0; j<opcode.args.length; j++) {
-            param = opcode.args[j];
-            if (typeof param === "string") {
-              param = "\"" + param.replace("\n", "\\n") + "\"";
-            }
-            params.push(param);
-          }
-          out.push(opcode.opcode + " " + params.join(" "));
-        }
-      }
-
-      return out.join("\n");
-    },
-
     equals: function(other) {
       var len = this.opcodes.length;
       if (other.opcodes.length !== len) {
@@ -1325,20 +1630,14 @@ var __module10__ = (function(__dependency1__) {
       for (var i = 0; i < len; i++) {
         var opcode = this.opcodes[i],
             otherOpcode = other.opcodes[i];
-        if (opcode.opcode !== otherOpcode.opcode || opcode.args.length !== otherOpcode.args.length) {
+        if (opcode.opcode !== otherOpcode.opcode || !argEquals(opcode.args, otherOpcode.args)) {
           return false;
         }
-        for (var j = 0; j < opcode.args.length; j++) {
-          if (opcode.args[j] !== otherOpcode.args[j]) {
-            return false;
-          }
-        }
       }
 
+      // We know that length is the same between the two arrays because they are directly tied
+      // to the opcode behavior above.
       len = this.children.length;
-      if (other.children.length !== len) {
-        return false;
-      }
       for (i = 0; i < len; i++) {
         if (!this.children[i].equals(other.children[i])) {
           return false;
@@ -1355,6 +1654,8 @@ var __module10__ = (function(__dependency1__) {
       this.children = [];
       this.depths = {list: []};
       this.options = options;
+      this.stringParams = options.stringParams;
+      this.trackIds = options.trackIds;
 
       // These changes will propagate to the other compiler components
       var knownHelpers = this.options.knownHelpers;
@@ -1365,7 +1666,8 @@ var __module10__ = (function(__dependency1__) {
         'if': true,
         'unless': true,
         'with': true,
-        'log': true
+        'log': true,
+        'lookup': true
       };
       if (knownHelpers) {
         for (var name in knownHelpers) {
@@ -1377,19 +1679,7 @@ var __module10__ = (function(__dependency1__) {
     },
 
     accept: function(node) {
-      var strip = node.strip || {},
-          ret;
-      if (strip.left) {
-        this.opcode('strip');
-      }
-
-      ret = this[node.type](node);
-
-      if (strip.right) {
-        this.opcode('strip');
-      }
-
-      return ret;
+      return this[node.type](node);
     },
 
     program: function(program) {
@@ -1451,7 +1741,7 @@ var __module10__ = (function(__dependency1__) {
         this.opcode('pushProgram', program);
         this.opcode('pushProgram', inverse);
         this.opcode('emptyHash');
-        this.opcode('blockValue');
+        this.opcode('blockValue', sexpr.id.original);
       } else {
         this.ambiguousSexpr(sexpr, program, inverse);
 
@@ -1467,31 +1757,15 @@ var __module10__ = (function(__dependency1__) {
     },
 
     hash: function(hash) {
-      var pairs = hash.pairs, pair, val;
+      var pairs = hash.pairs, i, l;
 
       this.opcode('pushHash');
 
-      for(var i=0, l=pairs.length; i<l; i++) {
-        pair = pairs[i];
-        val  = pair[1];
-
-        if (this.options.stringParams) {
-          if(val.depth) {
-            this.addDepth(val.depth);
-          }
-          this.opcode('getContext', val.depth || 0);
-          this.opcode('pushStringParam', val.stringModeValue, val.type);
-
-          if (val.type === 'sexpr') {
-            // Subexpressions get evaluated and passed in
-            // in string params mode.
-            this.sexpr(val);
-          }
-        } else {
-          this.accept(val);
-        }
-
-        this.opcode('assignToHash', pair[0]);
+      for(i=0, l=pairs.length; i<l; i++) {
+        this.pushParam(pairs[i][1]);
+      }
+      while(i--) {
+        this.opcode('assignToHash', pairs[i][0]);
       }
       this.opcode('popHash');
     },
@@ -1500,18 +1774,27 @@ var __module10__ = (function(__dependency1__) {
       var partialName = partial.partialName;
       this.usePartial = true;
 
-      if(partial.context) {
-        this.ID(partial.context);
+      if (partial.hash) {
+        this.accept(partial.hash);
       } else {
-        this.opcode('push', 'depth0');
+        this.opcode('push', 'undefined');
       }
 
-      this.opcode('invokePartial', partialName.name);
+      if (partial.context) {
+        this.accept(partial.context);
+      } else {
+        this.opcode('getContext', 0);
+        this.opcode('pushContext');
+      }
+
+      this.opcode('invokePartial', partialName.name, partial.indent || '');
       this.opcode('append');
     },
 
     content: function(content) {
-      this.opcode('appendContent', content.string);
+      if (content.string) {
+        this.opcode('appendContent', content.string);
+      }
     },
 
     mustache: function(mustache) {
@@ -1534,6 +1817,8 @@ var __module10__ = (function(__dependency1__) {
       this.opcode('pushProgram', program);
       this.opcode('pushProgram', inverse);
 
+      this.ID(id);
+
       this.opcode('invokeAmbiguous', name, isBlock);
     },
 
@@ -1556,14 +1841,18 @@ var __module10__ = (function(__dependency1__) {
 
     helperSexpr: function(sexpr, program, inverse) {
       var params = this.setupFullMustacheParams(sexpr, program, inverse),
-          name = sexpr.id.parts[0];
+          id = sexpr.id,
+          name = id.parts[0];
 
       if (this.options.knownHelpers[name]) {
         this.opcode('invokeKnownHelper', params.length, name);
       } else if (this.options.knownHelpersOnly) {
         throw new Exception("You specified knownHelpersOnly, but used the unknown helper " + name, sexpr);
       } else {
-        this.opcode('invokeHelper', params.length, name, sexpr.isRoot);
+        id.falsy = true;
+
+        this.ID(id);
+        this.opcode('invokeHelper', params.length, id.original, id.isSimple);
       }
     },
 
@@ -1585,35 +1874,24 @@ var __module10__ = (function(__dependency1__) {
 
       var name = id.parts[0];
       if (!name) {
+        // Context reference, i.e. `{{foo .}}` or `{{foo ..}}`
         this.opcode('pushContext');
       } else {
-        this.opcode('lookupOnContext', id.parts[0]);
-      }
-
-      for(var i=1, l=id.parts.length; i<l; i++) {
-        this.opcode('lookup', id.parts[i]);
+        this.opcode('lookupOnContext', id.parts, id.falsy, id.isScoped);
       }
     },
 
     DATA: function(data) {
       this.options.data = true;
-      if (data.id.isScoped || data.id.depth) {
-        throw new Exception('Scoped data references are not supported: ' + data.original, data);
-      }
-
-      this.opcode('lookupData');
-      var parts = data.id.parts;
-      for(var i=0, l=parts.length; i<l; i++) {
-        this.opcode('lookup', parts[i]);
-      }
+      this.opcode('lookupData', data.id.depth, data.id.parts);
     },
 
     STRING: function(string) {
       this.opcode('pushString', string.string);
     },
 
-    INTEGER: function(integer) {
-      this.opcode('pushLiteral', integer.integer);
+    NUMBER: function(number) {
+      this.opcode('pushLiteral', number.number);
     },
 
     BOOLEAN: function(bool) {
@@ -1624,11 +1902,7 @@ var __module10__ = (function(__dependency1__) {
 
     // HELPERS
     opcode: function(name) {
-      this.opcodes.push({ opcode: name, args: [].slice.call(arguments, 1) });
-    },
-
-    declare: function(name, value) {
-      this.opcodes.push({ opcode: 'DECLARE', name: name, value: value });
+      this.opcodes.push({ opcode: name, args: slice.call(arguments, 1) });
     },
 
     addDepth: function(depth) {
@@ -1646,6 +1920,7 @@ var __module10__ = (function(__dependency1__) {
       var options    = this.options;
 
       // if ambiguous, we can possibly resolve the ambiguity now
+      // An eligible helper is one that does not have a complex path, i.e. `this.foo`, `../foo` etc.
       if (isEligible && !isHelper) {
         var name = sexpr.id.parts[0];
 
@@ -1662,27 +1937,29 @@ var __module10__ = (function(__dependency1__) {
     },
 
     pushParams: function(params) {
-      var i = params.length, param;
+      for(var i=0, l=params.length; i<l; i++) {
+        this.pushParam(params[i]);
+      }
+    },
 
-      while(i--) {
-        param = params[i];
-
-        if(this.options.stringParams) {
-          if(param.depth) {
-            this.addDepth(param.depth);
-          }
-
-          this.opcode('getContext', param.depth || 0);
-          this.opcode('pushStringParam', param.stringModeValue, param.type);
-
-          if (param.type === 'sexpr') {
-            // Subexpressions get evaluated and passed in
-            // in string params mode.
-            this.sexpr(param);
-          }
-        } else {
-          this[param.type](param);
+    pushParam: function(val) {
+      if (this.stringParams) {
+        if(val.depth) {
+          this.addDepth(val.depth);
         }
+        this.opcode('getContext', val.depth || 0);
+        this.opcode('pushStringParam', val.stringModeValue, val.type);
+
+        if (val.type === 'sexpr') {
+          // Subexpressions get evaluated and passed in
+          // in string params mode.
+          this.sexpr(val);
+        }
+      } else {
+        if (this.trackIds) {
+          this.opcode('pushId', val.type, val.idName || val.stringModeValue);
+        }
+        this.accept(val);
       }
     },
 
@@ -1712,6 +1989,9 @@ var __module10__ = (function(__dependency1__) {
     if (!('data' in options)) {
       options.data = true;
     }
+    if (options.compat) {
+      options.useDepths = true;
+    }
 
     var ast = env.parse(input);
     var environment = new env.Compiler().compile(ast, options);
@@ -1728,6 +2008,9 @@ var __module10__ = (function(__dependency1__) {
     if (!('data' in options)) {
       options.data = true;
     }
+    if (options.compat) {
+      options.useDepths = true;
+    }
 
     var compiled;
 
@@ -1739,25 +2022,50 @@ var __module10__ = (function(__dependency1__) {
     }
 
     // Template is only compiled on first use and cached after that point.
-    return function(context, options) {
+    var ret = function(context, options) {
       if (!compiled) {
         compiled = compileInput();
       }
       return compiled.call(this, context, options);
     };
+    ret._setup = function(options) {
+      if (!compiled) {
+        compiled = compileInput();
+      }
+      return compiled._setup(options);
+    };
+    ret._child = function(i, data, depths) {
+      if (!compiled) {
+        compiled = compileInput();
+      }
+      return compiled._child(i, data, depths);
+    };
+    return ret;
   }
 
-  __exports__.compile = compile;
+  __exports__.compile = compile;function argEquals(a, b) {
+    if (a === b) {
+      return true;
+    }
+
+    if (isArray(a) && isArray(b) && a.length === b.length) {
+      for (var i = 0; i < a.length; i++) {
+        if (!argEquals(a[i], b[i])) {
+          return false;
+        }
+      }
+      return true;
+    }
+  }
   return __exports__;
-})(__module5__);
+})(__module5__, __module3__);
 
 // handlebars/compiler/javascript-compiler.js
-var __module11__ = (function(__dependency1__, __dependency2__) {
+var __module12__ = (function(__dependency1__, __dependency2__) {
   "use strict";
   var __exports__;
   var COMPILER_REVISION = __dependency1__.COMPILER_REVISION;
   var REVISION_CHANGES = __dependency1__.REVISION_CHANGES;
-  var log = __dependency1__.log;
   var Exception = __dependency2__;
 
   function Literal(value) {
@@ -1770,32 +2078,22 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
     // PUBLIC API: You can override these methods in a subclass to provide
     // alternative compiled forms for name lookup and buffering semantics
     nameLookup: function(parent, name /* , type*/) {
-      var wrap,
-          ret;
-      if (parent.indexOf('depth') === 0) {
-        wrap = true;
-      }
-
-      if (/^[0-9]+$/.test(name)) {
-        ret = parent + "[" + name + "]";
-      } else if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
-        ret = parent + "." + name;
-      }
-      else {
-        ret = parent + "['" + name + "']";
-      }
-
-      if (wrap) {
-        return '(' + parent + ' && ' + ret + ')';
+      if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
+        return parent + "." + name;
       } else {
-        return ret;
+        return parent + "['" + name + "']";
       }
     },
+    depthedLookup: function(name) {
+      this.aliases.lookup = 'this.lookup';
+
+      return 'lookup(depths, "' + name + '")';
+    },
 
     compilerInfo: function() {
       var revision = COMPILER_REVISION,
           versions = REVISION_CHANGES[revision];
-      return "this.compilerInfo = ["+revision+",'"+versions+"'];\n";
+      return [revision, versions];
     },
 
     appendToBuffer: function(string) {
@@ -1819,22 +2117,23 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
 
     compile: function(environment, options, context, asObject) {
       this.environment = environment;
-      this.options = options || {};
-
-      log('debug', this.environment.disassemble() + "\n\n");
+      this.options = options;
+      this.stringParams = this.options.stringParams;
+      this.trackIds = this.options.trackIds;
+      this.precompile = !asObject;
 
       this.name = this.environment.name;
       this.isChild = !!context;
       this.context = context || {
         programs: [],
-        environments: [],
-        aliases: { }
+        environments: []
       };
 
       this.preamble();
 
       this.stackSlot = 0;
       this.stackVars = [];
+      this.aliases = {};
       this.registers = { list: [] };
       this.hashes = [];
       this.compileStack = [];
@@ -1842,118 +2141,109 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
 
       this.compileChildren(environment, options);
 
-      var opcodes = environment.opcodes, opcode;
+      this.useDepths = this.useDepths || environment.depths.list.length || this.options.compat;
 
-      this.i = 0;
+      var opcodes = environment.opcodes,
+          opcode,
+          i,
+          l;
 
-      for(var l=opcodes.length; this.i<l; this.i++) {
-        opcode = opcodes[this.i];
+      for (i = 0, l = opcodes.length; i < l; i++) {
+        opcode = opcodes[i];
 
-        if(opcode.opcode === 'DECLARE') {
-          this[opcode.name] = opcode.value;
-        } else {
-          this[opcode.opcode].apply(this, opcode.args);
-        }
-
-        // Reset the stripNext flag if it was not set by this operation.
-        if (opcode.opcode !== this.stripNext) {
-          this.stripNext = false;
-        }
+        this[opcode.opcode].apply(this, opcode.args);
       }
 
       // Flush any trailing content that might be pending.
       this.pushSource('');
 
+      /* istanbul ignore next */
       if (this.stackSlot || this.inlineStack.length || this.compileStack.length) {
         throw new Exception('Compile completed with content left on stack');
       }
 
-      return this.createFunctionContext(asObject);
+      var fn = this.createFunctionContext(asObject);
+      if (!this.isChild) {
+        var ret = {
+          compiler: this.compilerInfo(),
+          main: fn
+        };
+        var programs = this.context.programs;
+        for (i = 0, l = programs.length; i < l; i++) {
+          if (programs[i]) {
+            ret[i] = programs[i];
+          }
+        }
+
+        if (this.environment.usePartial) {
+          ret.usePartial = true;
+        }
+        if (this.options.data) {
+          ret.useData = true;
+        }
+        if (this.useDepths) {
+          ret.useDepths = true;
+        }
+        if (this.options.compat) {
+          ret.compat = true;
+        }
+
+        if (!asObject) {
+          ret.compiler = JSON.stringify(ret.compiler);
+          ret = this.objectLiteral(ret);
+        }
+
+        return ret;
+      } else {
+        return fn;
+      }
     },
 
     preamble: function() {
-      var out = [];
-
-      if (!this.isChild) {
-        var namespace = this.namespace;
-
-        var copies = "helpers = this.merge(helpers, " + namespace + ".helpers);";
-        if (this.environment.usePartial) { copies = copies + " partials = this.merge(partials, " + namespace + ".partials);"; }
-        if (this.options.data) { copies = copies + " data = data || {};"; }
-        out.push(copies);
-      } else {
-        out.push('');
-      }
-
-      if (!this.environment.isSimple) {
-        out.push(", buffer = " + this.initializeBuffer());
-      } else {
-        out.push("");
-      }
-
       // track the last context pushed into place to allow skipping the
       // getContext opcode when it would be a noop
       this.lastContext = 0;
-      this.source = out;
+      this.source = [];
     },
 
     createFunctionContext: function(asObject) {
-      var locals = this.stackVars.concat(this.registers.list);
+      var varDeclarations = '';
 
+      var locals = this.stackVars.concat(this.registers.list);
       if(locals.length > 0) {
-        this.source[1] = this.source[1] + ", " + locals.join(", ");
+        varDeclarations += ", " + locals.join(", ");
       }
 
       // Generate minimizer alias mappings
-      if (!this.isChild) {
-        for (var alias in this.context.aliases) {
-          if (this.context.aliases.hasOwnProperty(alias)) {
-            this.source[1] = this.source[1] + ', ' + alias + '=' + this.context.aliases[alias];
-          }
+      for (var alias in this.aliases) {
+        if (this.aliases.hasOwnProperty(alias)) {
+          varDeclarations += ', ' + alias + '=' + this.aliases[alias];
         }
       }
 
-      if (this.source[1]) {
-        this.source[1] = "var " + this.source[1].substring(2) + ";";
-      }
+      var params = ["depth0", "helpers", "partials", "data"];
 
-      // Merge children
-      if (!this.isChild) {
-        this.source[1] += '\n' + this.context.programs.join('\n') + '\n';
-      }
-
-      if (!this.environment.isSimple) {
-        this.pushSource("return buffer;");
-      }
-
-      var params = this.isChild ? ["depth0", "data"] : ["Handlebars", "depth0", "helpers", "partials", "data"];
-
-      for(var i=0, l=this.environment.depths.list.length; i<l; i++) {
-        params.push("depth" + this.environment.depths.list[i]);
+      if (this.useDepths) {
+        params.push('depths');
       }
 
       // Perform a second pass over the output to merge content when possible
-      var source = this.mergeSource();
-
-      if (!this.isChild) {
-        source = this.compilerInfo()+source;
-      }
+      var source = this.mergeSource(varDeclarations);
 
       if (asObject) {
         params.push(source);
 
         return Function.apply(this, params);
       } else {
-        var functionSource = 'function ' + (this.name || '') + '(' + params.join(',') + ') {\n  ' + source + '}';
-        log('debug', functionSource + "\n\n");
-        return functionSource;
+        return 'function(' + params.join(',') + ') {\n  ' + source + '}';
       }
     },
-    mergeSource: function() {
-      // WARN: We are not handling the case where buffer is still populated as the source should
-      // not have buffer append operations as their final action.
+    mergeSource: function(varDeclarations) {
       var source = '',
-          buffer;
+          buffer,
+          appendOnly = !this.forceBuffer,
+          appendFirst;
+
       for (var i = 0, len = this.source.length; i < len; i++) {
         var line = this.source[i];
         if (line.appendToBuffer) {
@@ -1964,12 +2254,39 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
           }
         } else {
           if (buffer) {
-            source += 'buffer += ' + buffer + ';\n  ';
+            if (!source) {
+              appendFirst = true;
+              source = buffer + ';\n  ';
+            } else {
+              source += 'buffer += ' + buffer + ';\n  ';
+            }
             buffer = undefined;
           }
           source += line + '\n  ';
+
+          if (!this.environment.isSimple) {
+            appendOnly = false;
+          }
         }
       }
+
+      if (appendOnly) {
+        if (buffer || !source) {
+          source += 'return ' + (buffer || '""') + ';\n';
+        }
+      } else {
+        varDeclarations += ", buffer = " + (appendFirst ? '' : this.initializeBuffer());
+        if (buffer) {
+          source += 'return buffer + ' + buffer + ';\n';
+        } else {
+          source += 'return buffer;\n';
+        }
+      }
+
+      if (varDeclarations) {
+        source = 'var ' + varDeclarations.substring(2) + (appendFirst ? '' : ';\n  ') + source;
+      }
+
       return source;
     },
 
@@ -1979,19 +2296,19 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
     // On stack, after: return value of blockHelperMissing
     //
     // The purpose of this opcode is to take a block of the form
-    // `{{#foo}}...{{/foo}}`, resolve the value of `foo`, and
+    // `{{#this.foo}}...{{/this.foo}}`, resolve the value of `foo`, and
     // replace it on the stack with the result of properly
     // invoking blockHelperMissing.
-    blockValue: function() {
-      this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
+    blockValue: function(name) {
+      this.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
 
-      var params = ["depth0"];
-      this.setupParams(0, params);
+      var params = [this.contextName(0)];
+      this.setupParams(name, 0, params);
 
-      this.replaceStack(function(current) {
-        params.splice(1, 0, current);
-        return "blockHelperMissing.call(" + params.join(", ") + ")";
-      });
+      var blockName = this.popStack();
+      params.splice(1, 0, blockName);
+
+      this.push('blockHelperMissing.call(' + params.join(', ') + ')');
     },
 
     // [ambiguousBlockValue]
@@ -2001,10 +2318,13 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
     // On stack, after, if no lastHelper: same as [blockValue]
     // On stack, after, if lastHelper: value
     ambiguousBlockValue: function() {
-      this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
+      this.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
 
-      var params = ["depth0"];
-      this.setupParams(0, params);
+      // We're being a bit cheeky and reusing the options value from the prior exec
+      var params = [this.contextName(0)];
+      this.setupParams('', 0, params, true);
+
+      this.flushInline();
 
       var current = this.topStack();
       params.splice(1, 0, current);
@@ -2022,27 +2342,10 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
       if (this.pendingContent) {
         content = this.pendingContent + content;
       }
-      if (this.stripNext) {
-        content = content.replace(/^\s+/, '');
-      }
 
       this.pendingContent = content;
     },
 
-    // [strip]
-    //
-    // On stack, before: ...
-    // On stack, after: ...
-    //
-    // Removes any trailing whitespace from the prior content node and flags
-    // the next operation for stripping if it is a content node.
-    strip: function() {
-      if (this.pendingContent) {
-        this.pendingContent = this.pendingContent.replace(/\s+$/, '');
-      }
-      this.stripNext = 'strip';
-    },
-
     // [append]
     //
     // On stack, before: value, ...
@@ -2057,7 +2360,7 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
       // when we examine local
       this.flushInline();
       var local = this.popStack();
-      this.pushSource("if(" + local + " || " + local + " === 0) { " + this.appendToBuffer(local) + " }");
+      this.pushSource('if (' + local + ' != null) { ' + this.appendToBuffer(local) + ' }');
       if (this.environment.isSimple) {
         this.pushSource("else { " + this.appendToBuffer("''") + " }");
       }
@@ -2070,7 +2373,7 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
     //
     // Escape `value` and append it to the buffer
     appendEscaped: function() {
-      this.context.aliases.escapeExpression = 'this.escapeExpression';
+      this.aliases.escapeExpression = 'this.escapeExpression';
 
       this.pushSource(this.appendToBuffer("escapeExpression(" + this.popStack() + ")"));
     },
@@ -2083,20 +2386,7 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
     //
     // Set the value of the `lastContext` compiler value to the depth
     getContext: function(depth) {
-      if(this.lastContext !== depth) {
-        this.lastContext = depth;
-      }
-    },
-
-    // [lookupOnContext]
-    //
-    // On stack, before: ...
-    // On stack, after: currentContext[name], ...
-    //
-    // Looks up the value of `name` on the current context and pushes
-    // it onto the stack.
-    lookupOnContext: function(name) {
-      this.push(this.nameLookup('depth' + this.lastContext, name, 'context'));
+      this.lastContext = depth;
     },
 
     // [pushContext]
@@ -2106,7 +2396,64 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
     //
     // Pushes the value of the current context onto the stack.
     pushContext: function() {
-      this.pushStackLiteral('depth' + this.lastContext);
+      this.pushStackLiteral(this.contextName(this.lastContext));
+    },
+
+    // [lookupOnContext]
+    //
+    // On stack, before: ...
+    // On stack, after: currentContext[name], ...
+    //
+    // Looks up the value of `name` on the current context and pushes
+    // it onto the stack.
+    lookupOnContext: function(parts, falsy, scoped) {
+      /*jshint -W083 */
+      var i = 0,
+          len = parts.length;
+
+      if (!scoped && this.options.compat && !this.lastContext) {
+        // The depthed query is expected to handle the undefined logic for the root level that
+        // is implemented below, so we evaluate that directly in compat mode
+        this.push(this.depthedLookup(parts[i++]));
+      } else {
+        this.pushContext();
+      }
+
+      for (; i < len; i++) {
+        this.replaceStack(function(current) {
+          var lookup = this.nameLookup(current, parts[i], 'context');
+          // We want to ensure that zero and false are handled properly if the context (falsy flag)
+          // needs to have the special handling for these values.
+          if (!falsy) {
+            return ' != null ? ' + lookup + ' : ' + current;
+          } else {
+            // Otherwise we can use generic falsy handling
+            return ' && ' + lookup;
+          }
+        });
+      }
+    },
+
+    // [lookupData]
+    //
+    // On stack, before: ...
+    // On stack, after: data, ...
+    //
+    // Push the data lookup operator
+    lookupData: function(depth, parts) {
+      /*jshint -W083 */
+      if (!depth) {
+        this.pushStackLiteral('data');
+      } else {
+        this.pushStackLiteral('this.data(data, ' + depth + ')');
+      }
+
+      var len = parts.length;
+      for (var i = 0; i < len; i++) {
+        this.replaceStack(function(current) {
+          return ' && ' + this.nameLookup(current, parts[i], 'data');
+        });
+      }
     },
 
     // [resolvePossibleLambda]
@@ -2117,34 +2464,9 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
     // If the `value` is a lambda, replace it on the stack by
     // the return value of the lambda
     resolvePossibleLambda: function() {
-      this.context.aliases.functionType = '"function"';
+      this.aliases.lambda = 'this.lambda';
 
-      this.replaceStack(function(current) {
-        return "typeof " + current + " === functionType ? " + current + ".apply(depth0) : " + current;
-      });
-    },
-
-    // [lookup]
-    //
-    // On stack, before: value, ...
-    // On stack, after: value[name], ...
-    //
-    // Replace the value on the stack with the result of looking
-    // up `name` on `value`
-    lookup: function(name) {
-      this.replaceStack(function(current) {
-        return current + " == null || " + current + " === false ? " + current + " : " + this.nameLookup(current, name, 'context');
-      });
-    },
-
-    // [lookupData]
-    //
-    // On stack, before: ...
-    // On stack, after: data, ...
-    //
-    // Push the data lookup operator
-    lookupData: function() {
-      this.pushStackLiteral('data');
+      this.push('lambda(' + this.popStack() + ', ' + this.contextName(0) + ')');
     },
 
     // [pushStringParam]
@@ -2156,8 +2478,7 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
     // provides the string value of a parameter along with its
     // depth rather than resolving it immediately.
     pushStringParam: function(string, type) {
-      this.pushStackLiteral('depth' + this.lastContext);
-
+      this.pushContext();
       this.pushString(type);
 
       // If it's a subexpression, the string result
@@ -2174,7 +2495,10 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
     emptyHash: function() {
       this.pushStackLiteral('{}');
 
-      if (this.options.stringParams) {
+      if (this.trackIds) {
+        this.push('{}'); // hashIds
+      }
+      if (this.stringParams) {
         this.push('{}'); // hashContexts
         this.push('{}'); // hashTypes
       }
@@ -2183,13 +2507,16 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
       if (this.hash) {
         this.hashes.push(this.hash);
       }
-      this.hash = {values: [], types: [], contexts: []};
+      this.hash = {values: [], types: [], contexts: [], ids: []};
     },
     popHash: function() {
       var hash = this.hash;
       this.hash = this.hashes.pop();
 
-      if (this.options.stringParams) {
+      if (this.trackIds) {
+        this.push('{' + hash.ids.join(',') + '}');
+      }
+      if (this.stringParams) {
         this.push('{' + hash.contexts.join(',') + '}');
         this.push('{' + hash.types.join(',') + '}');
       }
@@ -2255,31 +2582,14 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
     // and pushes the helper's return value onto the stack.
     //
     // If the helper is not found, `helperMissing` is called.
-    invokeHelper: function(paramSize, name, isRoot) {
-      this.context.aliases.helperMissing = 'helpers.helperMissing';
-      this.useRegister('helper');
+    invokeHelper: function(paramSize, name, isSimple) {
+      this.aliases.helperMissing = 'helpers.helperMissing';
 
-      var helper = this.lastHelper = this.setupHelper(paramSize, name, true);
-      var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
+      var nonHelper = this.popStack();
+      var helper = this.setupHelper(paramSize, name);
 
-      var lookup = 'helper = ' + helper.name + ' || ' + nonHelper;
-      if (helper.paramsInit) {
-        lookup += ',' + helper.paramsInit;
-      }
-
-      this.push(
-        '('
-          + lookup
-          + ',helper '
-            + '? helper.call(' + helper.callParams + ') '
-            + ': helperMissing.call(' + helper.helperMissingParams + '))');
-
-      // Always flush subexpressions. This is both to prevent the compounding size issue that
-      // occurs when the code has to be duplicated for inlining and also to prevent errors
-      // due to the incorrect options object being passed due to the shared register.
-      if (!isRoot) {
-        this.flushInline();
-      }
+      var lookup = (isSimple ? helper.name + ' || ' : '') + nonHelper + ' || helperMissing';
+      this.push('((' + lookup + ').call(' + helper.callParams + '))');
     },
 
     // [invokeKnownHelper]
@@ -2307,22 +2617,21 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
     // and can be avoided by passing the `knownHelpers` and
     // `knownHelpersOnly` flags at compile-time.
     invokeAmbiguous: function(name, helperCall) {
-      this.context.aliases.functionType = '"function"';
+      this.aliases.functionType = '"function"';
+      this.aliases.helperMissing = 'helpers.helperMissing';
       this.useRegister('helper');
 
+      var nonHelper = this.popStack();
+
       this.emptyHash();
       var helper = this.setupHelper(0, name, helperCall);
 
       var helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper');
 
-      var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
-      var nextStack = this.nextStack();
-
-      if (helper.paramsInit) {
-        this.pushSource(helper.paramsInit);
-      }
-      this.pushSource('if (helper = ' + helperName + ') { ' + nextStack + ' = helper.call(' + helper.callParams + '); }');
-      this.pushSource('else { helper = ' + nonHelper + '; ' + nextStack + ' = typeof helper === functionType ? helper.call(' + helper.callParams + ') : helper; }');
+      this.push(
+        '((helper = (helper = ' + helperName + ' || ' + nonHelper + ') != null ? helper : helperMissing'
+          + (helper.paramsInit ? '),(' + helper.paramsInit : '') + '),'
+        + '(typeof helper === functionType ? helper.call(' + helper.callParams + ') : helper))');
     },
 
     // [invokePartial]
@@ -2332,30 +2641,37 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
     //
     // This operation pops off a context, invokes a partial with that context,
     // and pushes the result of the invocation back.
-    invokePartial: function(name) {
-      var params = [this.nameLookup('partials', name, 'partial'), "'" + name + "'", this.popStack(), "helpers", "partials"];
+    invokePartial: function(name, indent) {
+      var params = [this.nameLookup('partials', name, 'partial'), "'" + indent + "'", "'" + name + "'", this.popStack(), this.popStack(), "helpers", "partials"];
 
       if (this.options.data) {
         params.push("data");
+      } else if (this.options.compat) {
+        params.push('undefined');
+      }
+      if (this.options.compat) {
+        params.push('depths');
       }
 
-      this.context.aliases.self = "this";
-      this.push("self.invokePartial(" + params.join(", ") + ")");
+      this.push("this.invokePartial(" + params.join(", ") + ")");
     },
 
     // [assignToHash]
     //
-    // On stack, before: value, hash, ...
-    // On stack, after: hash, ...
+    // On stack, before: value, ..., hash, ...
+    // On stack, after: ..., hash, ...
     //
-    // Pops a value and hash off the stack, assigns `hash[key] = value`
-    // and pushes the hash back onto the stack.
+    // Pops a value off the stack and assigns it to the current hash
     assignToHash: function(key) {
       var value = this.popStack(),
           context,
-          type;
+          type,
+          id;
 
-      if (this.options.stringParams) {
+      if (this.trackIds) {
+        id = this.popStack();
+      }
+      if (this.stringParams) {
         type = this.popStack();
         context = this.popStack();
       }
@@ -2367,9 +2683,22 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
       if (type) {
         hash.types.push("'" + key + "': " + type);
       }
+      if (id) {
+        hash.ids.push("'" + key + "': " + id);
+      }
       hash.values.push("'" + key + "': (" + value + ")");
     },
 
+    pushId: function(type, name) {
+      if (type === 'ID' || type === 'DATA') {
+        this.pushString(name);
+      } else if (type === 'sexpr') {
+        this.pushStackLiteral('true');
+      } else {
+        this.pushStackLiteral('null');
+      }
+    },
+
     // HELPERS
 
     compiler: JavaScriptCompiler,
@@ -2388,8 +2717,10 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
           index = this.context.programs.length;
           child.index = index;
           child.name = 'program' + index;
-          this.context.programs[index] = compiler.compile(child, options, this.context);
+          this.context.programs[index] = compiler.compile(child, options, this.context, !this.precompile);
           this.context.environments[index] = child;
+
+          this.useDepths = this.useDepths || compiler.useDepths;
         } else {
           child.index = index;
           child.name = 'program' + index;
@@ -2406,30 +2737,18 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
     },
 
     programExpression: function(guid) {
-      this.context.aliases.self = "this";
-
-      if(guid == null) {
-        return "self.noop";
-      }
-
       var child = this.environment.children[guid],
-          depths = child.depths.list, depth;
+          depths = child.depths.list,
+          useDepths = this.useDepths,
+          depth;
 
-      var programParams = [child.index, child.name, "data"];
+      var programParams = [child.index, 'data'];
 
-      for(var i=0, l = depths.length; i<l; i++) {
-        depth = depths[i];
-
-        if(depth === 1) { programParams.push("depth0"); }
-        else { programParams.push("depth" + (depth - 1)); }
+      if (useDepths) {
+        programParams.push('depths');
       }
 
-      return (depths.length === 0 ? "self.program(" : "self.programWithDepth(") + programParams.join(", ") + ")";
-    },
-
-    register: function(name, val) {
-      this.useRegister(name);
-      this.pushSource(name + " = " + val + ";");
+      return 'this.program(' + programParams.join(', ') + ')';
     },
 
     useRegister: function(name) {
@@ -2458,9 +2777,7 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
       this.flushInline();
 
       var stack = this.incrStack();
-      if (item) {
-        this.pushSource(stack + " = " + item + ";");
-      }
+      this.pushSource(stack + " = " + item + ";");
       this.compileStack.push(stack);
       return stack;
     },
@@ -2472,50 +2789,36 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
           createdStack,
           usedLiteral;
 
-      // If we are currently inline then we want to merge the inline statement into the
-      // replacement statement via ','
-      if (inline) {
-        var top = this.popStack(true);
+      /* istanbul ignore next */
+      if (!this.isInline()) {
+        throw new Exception('replaceStack on non-inline');
+      }
 
-        if (top instanceof Literal) {
-          // Literals do not need to be inlined
-          stack = top.value;
-          usedLiteral = true;
-        } else {
-          // Get or create the current stack name for use by the inline
-          createdStack = !this.stackSlot;
-          var name = !createdStack ? this.topStackName() : this.incrStack();
+      // We want to merge the inline statement into the replacement statement via ','
+      var top = this.popStack(true);
 
-          prefix = '(' + this.push(name) + ' = ' + top + '),';
-          stack = this.topStack();
-        }
+      if (top instanceof Literal) {
+        // Literals do not need to be inlined
+        prefix = stack = top.value;
+        usedLiteral = true;
       } else {
+        // Get or create the current stack name for use by the inline
+        createdStack = !this.stackSlot;
+        var name = !createdStack ? this.topStackName() : this.incrStack();
+
+        prefix = '(' + this.push(name) + ' = ' + top + ')';
         stack = this.topStack();
       }
 
       var item = callback.call(this, stack);
 
-      if (inline) {
-        if (!usedLiteral) {
-          this.popStack();
-        }
-        if (createdStack) {
-          this.stackSlot--;
-        }
-        this.push('(' + prefix + item + ')');
-      } else {
-        // Prevent modification of the context depth variable. Through replaceStack
-        if (!/^stack/.test(stack)) {
-          stack = this.nextStack();
-        }
-
-        this.pushSource(stack + " = (" + prefix + item + ");");
+      if (!usedLiteral) {
+        this.popStack();
       }
-      return stack;
-    },
-
-    nextStack: function() {
-      return this.pushStack();
+      if (createdStack) {
+        this.stackSlot--;
+      }
+      this.push('(' + prefix + item + ')');
     },
 
     incrStack: function() {
@@ -2552,6 +2855,7 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
         return item.value;
       } else {
         if (!inline) {
+          /* istanbul ignore next */
           if (!this.stackSlot) {
             throw new Exception('Invalid stack pop');
           }
@@ -2561,17 +2865,25 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
       }
     },
 
-    topStack: function(wrapped) {
+    topStack: function() {
       var stack = (this.isInline() ? this.inlineStack : this.compileStack),
           item = stack[stack.length - 1];
 
-      if (!wrapped && (item instanceof Literal)) {
+      if (item instanceof Literal) {
         return item.value;
       } else {
         return item;
       }
     },
 
+    contextName: function(context) {
+      if (this.useDepths && context) {
+        return 'depths[' + context + ']';
+      } else {
+        return 'depth' + context;
+      }
+    },
+
     quotedString: function(str) {
       return '"' + str
         .replace(/\\/g, '\\\\')
@@ -2582,28 +2894,43 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
         .replace(/\u2029/g, '\\u2029') + '"';
     },
 
-    setupHelper: function(paramSize, name, missingParams) {
+    objectLiteral: function(obj) {
+      var pairs = [];
+
+      for (var key in obj) {
+        if (obj.hasOwnProperty(key)) {
+          pairs.push(this.quotedString(key) + ':' + obj[key]);
+        }
+      }
+
+      return '{' + pairs.join(',') + '}';
+    },
+
+    setupHelper: function(paramSize, name, blockHelper) {
       var params = [],
-          paramsInit = this.setupParams(paramSize, params, missingParams);
+          paramsInit = this.setupParams(name, paramSize, params, blockHelper);
       var foundHelper = this.nameLookup('helpers', name, 'helper');
 
       return {
         params: params,
         paramsInit: paramsInit,
         name: foundHelper,
-        callParams: ["depth0"].concat(params).join(", "),
-        helperMissingParams: missingParams && ["depth0", this.quotedString(name)].concat(params).join(", ")
+        callParams: [this.contextName(0)].concat(params).join(", ")
       };
     },
 
-    setupOptions: function(paramSize, params) {
-      var options = [], contexts = [], types = [], param, inverse, program;
+    setupOptions: function(helper, paramSize, params) {
+      var options = {}, contexts = [], types = [], ids = [], param, inverse, program;
 
-      options.push("hash:" + this.popStack());
+      options.name = this.quotedString(helper);
+      options.hash = this.popStack();
 
-      if (this.options.stringParams) {
-        options.push("hashTypes:" + this.popStack());
-        options.push("hashContexts:" + this.popStack());
+      if (this.trackIds) {
+        options.hashIds = this.popStack();
+      }
+      if (this.stringParams) {
+        options.hashTypes = this.popStack();
+        options.hashContexts = this.popStack();
       }
 
       inverse = this.popStack();
@@ -2613,36 +2940,43 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
       // helpers to do a check for `if (options.fn)`
       if (program || inverse) {
         if (!program) {
-          this.context.aliases.self = "this";
-          program = "self.noop";
+          program = 'this.noop';
         }
 
         if (!inverse) {
-          this.context.aliases.self = "this";
-          inverse = "self.noop";
+          inverse = 'this.noop';
         }
 
-        options.push("inverse:" + inverse);
-        options.push("fn:" + program);
+        options.fn = program;
+        options.inverse = inverse;
       }
 
-      for(var i=0; i<paramSize; i++) {
+      // The parameters go on to the stack in order (making sure that they are evaluated in order)
+      // so we need to pop them off the stack in reverse order
+      var i = paramSize;
+      while (i--) {
         param = this.popStack();
-        params.push(param);
+        params[i] = param;
 
-        if(this.options.stringParams) {
-          types.push(this.popStack());
-          contexts.push(this.popStack());
+        if (this.trackIds) {
+          ids[i] = this.popStack();
+        }
+        if (this.stringParams) {
+          types[i] = this.popStack();
+          contexts[i] = this.popStack();
         }
       }
 
-      if (this.options.stringParams) {
-        options.push("contexts:[" + contexts.join(",") + "]");
-        options.push("types:[" + types.join(",") + "]");
+      if (this.trackIds) {
+        options.ids = "[" + ids.join(",") + "]";
+      }
+      if (this.stringParams) {
+        options.types = "[" + types.join(",") + "]";
+        options.contexts = "[" + contexts.join(",") + "]";
       }
 
-      if(this.options.data) {
-        options.push("data:data");
+      if (this.options.data) {
+        options.data = "data";
       }
 
       return options;
@@ -2650,8 +2984,8 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
 
     // the params and contexts arguments are passed in arrays
     // to fill in
-    setupParams: function(paramSize, params, useRegister) {
-      var options = '{' + this.setupOptions(paramSize, params).join(',') + '}';
+    setupParams: function(helperName, paramSize, params, useRegister) {
+      var options = this.objectLiteral(this.setupOptions(helperName, paramSize, params));
 
       if (useRegister) {
         this.useRegister('options');
@@ -2689,10 +3023,7 @@ var __module11__ = (function(__dependency1__, __dependency2__) {
   }
 
   JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
-    if(!JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(name)) {
-      return true;
-    }
-    return false;
+    return !JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(name);
   };
 
   __exports__ = JavaScriptCompiler;
@@ -2738,9 +3069,11 @@ var __module0__ = (function(__dependency1__, __dependency2__, __dependency3__, _
   Handlebars = create();
   Handlebars.create = create;
 
+  Handlebars['default'] = Handlebars;
+
   __exports__ = Handlebars;
   return __exports__;
-})(__module1__, __module7__, __module8__, __module10__, __module11__);
+})(__module1__, __module7__, __module8__, __module11__, __module12__);
 
   return __module0__;
-})();
+}));
diff --git a/vendor/assets/javascripts/production/ember.js b/vendor/assets/javascripts/production/ember.js
index 91d071be02d..f695ceeeb44 100644
--- a/vendor/assets/javascripts/production/ember.js
+++ b/vendor/assets/javascripts/production/ember.js
@@ -5,7 +5,7 @@
  *            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.9.0
  */
 
 (function() {
@@ -14,6 +14,7 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
 (function() {
   Ember = this.Ember = this.Ember || {};
   if (typeof Ember === 'undefined') { Ember = {}; };
+  function UNDEFINED() { }
 
   if (typeof Ember.__loader === 'undefined') {
     var registry = {}, seen = {};
@@ -23,7 +24,11 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
     };
 
     requirejs = eriuqer = requireModule = function(name) {
-      if (seen.hasOwnProperty(name)) { return seen[name]; }
+      var s = seen[name];
+
+      if (s !== undefined) { return seen[name]; }
+      if (s === UNDEFINED) { return undefined;  }
+
       seen[name] = {};
 
       if (!registry[name]) {
@@ -35,34 +40,37 @@ var enifed, requireModule, eriuqer, requirejs, Ember;
       var callback = mod.callback;
       var reified = [];
       var exports;
+      var length = deps.length;
 
-      for (var i=0, l=deps.length; i<l; i++) {
+      for (var i=0; i<length; i++) {
         if (deps[i] === 'exports') {
           reified.push(exports = {});
         } else {
-          reified.push(requireModule(resolve(deps[i])));
+          reified.push(requireModule(resolve(deps[i], name)));
         }
       }
 
-      var value = callback.apply(this, reified);
-      return seen[name] = exports || value;
+      var value = length === 0 ? callback.call(this) : callback.apply(this, reified);
 
-      function resolve(child) {
-        if (child.charAt(0) !== '.') { return child; }
-        var parts = child.split("/");
-        var parentBase = name.split("/").slice(0, -1);
-
-        for (var i=0, l=parts.length; i<l; i++) {
-          var part = parts[i];
-
-          if (part === '..') { parentBase.pop(); }
-          else if (part === '.') { continue; }
-          else { parentBase.push(part); }
-        }
-
-        return parentBase.join("/");
-      }
+      return seen[name] = exports || (value === undefined ? UNDEFINED : value);
     };
+
+    function resolve(child, name) {
+      if (child.charAt(0) !== '.') { return child; }
+      var parts = child.split("/");
+      var parentBase = name.split("/").slice(0, -1);
+
+      for (var i=0, l=parts.length; i<l; i++) {
+        var part = parts[i];
+
+        if (part === '..') { parentBase.pop(); }
+        else if (part === '.') { continue; }
+        else { parentBase.push(part); }
+      }
+
+      return parentBase.join("/");
+    }
+
     requirejs._eak_seen = registry;
 
     Ember.__loader = {define: enifed, require: eriuqer, registry: registry};
@@ -193,6 +201,23 @@ enifed("backburner",
         }
       },
 
+      join: function(target, method /*, args */) {
+        if (this.currentInstance) {
+          if (!method) {
+            method = target;
+            target = null;
+          }
+
+          if (isString(method)) {
+            method = target[method];
+          }
+
+          return method.apply(target, slice.call(arguments, 2));
+        } else {
+          return this.run.apply(this, arguments);
+        }
+      },
+
       defer: function(queueName, target, method /* , args */) {
         if (!method) {
           method = target;
@@ -640,11 +665,10 @@ enifed("backburner/deferred-action-queues",
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var each = __dependency1__.each;
-    var isString = __dependency1__.isString;
     var Queue = __dependency2__["default"];
 
     function DeferredActionQueues(queueNames, options) {
-      var queues = this.queues = {};
+      var queues = this.queues = Object.create(null);
       this.queueNames = queueNames = queueNames || [];
 
       this.options = options;
@@ -663,7 +687,9 @@ enifed("backburner/deferred-action-queues",
         var queues = this.queues;
         var queue = queues[name];
 
-        if (!queue) { noSuchQueue(name); }
+        if (!queue) {
+          noSuchQueue(name);
+        }
 
         if (onceFlag) {
           return queue.pushUnique(target, method, args, stack);
@@ -672,26 +698,6 @@ enifed("backburner/deferred-action-queues",
         }
       },
 
-      invoke: function(target, method, args, _, _errorRecordedForStack) {
-        if (args && args.length > 0) {
-          method.apply(target, args);
-        } else {
-          method.call(target);
-        }
-      },
-
-      invokeWithOnError: function(target, method, args, onError, errorRecordedForStack) {
-        try {
-          if (args && args.length > 0) {
-            method.apply(target, args);
-          } else {
-            method.call(target);
-          }
-        } catch(error) {
-          onError(error, errorRecordedForStack);
-        }
-      },
-
       flush: function() {
         var queues = this.queues;
         var queueNames = this.queueNames;
@@ -699,85 +705,23 @@ enifed("backburner/deferred-action-queues",
         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;
 
         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 numberOfQueueItems = queue._queue.length;
 
-          if (numberOfQueueItems && before) {
-            before();
-          }
-
-          while (queueIndex < numberOfQueueItems) {
-            target                = queueItems[queueIndex];
-            method                = queueItems[queueIndex+1];
-            args                  = queueItems[queueIndex+2];
-            errorRecordedForStack = queueItems[queueIndex+3]; // Debugging assistance
-
-            //
-
-            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);
-            }
-
-            queueIndex += 4;
-          }
-
-          queue._queueBeingFlushed = null;
-          if (numberOfQueueItems && after) {
-            after();
-          }
-
-          if ((priorQueueNameIndex = indexOfPriorQueueWithActions(this, queueNameIndex)) !== -1) {
-            queueNameIndex = priorQueueNameIndex;
-          } else {
+          if (numberOfQueueItems === 0) {
             queueNameIndex++;
+          } else {
+            queue.flush(false /* async */);
+            queueNameIndex = 0;
           }
         }
       }
     };
 
-    function indexOfPriorQueueWithActions(daq, currentQueueIndex) {
-      var queueName, queue;
-
-      for (var i = 0, l = currentQueueIndex; i <= l; i++) {
-        queueName = daq.queueNames[i];
-        queue = daq.queues[queueName];
-        if (queue._queue.length) { return i; }
-      }
-
-      return -1;
-    }
-
     __exports__["default"] = DeferredActionQueues;
   });
 enifed("backburner/platform",
@@ -795,9 +739,11 @@ enifed("backburner/platform",
     __exports__.needsIETryCatchFix = needsIETryCatchFix;
   });
 enifed("backburner/queue",
-  ["exports"],
-  function(__exports__) {
+  ["./utils","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
+    var isString = __dependency1__.isString;
+
     function Queue(name, options, globalOptions) {
       this.name = name;
       this.globalOptions = globalOptions || {};
@@ -895,56 +841,89 @@ enifed("backburner/queue",
         };
       },
 
-      // TODO: remove me, only being used for Ember.run.sync
-      flush: function() {
+      invoke: function(target, method, args, _, _errorRecordedForStack) {
+        if (args && args.length > 0) {
+          method.apply(target, args);
+        } else {
+          method.call(target);
+        }
+      },
+
+      invokeWithOnError: function(target, method, args, onError, errorRecordedForStack) {
+        try {
+          if (args && args.length > 0) {
+            method.apply(target, args);
+          } else {
+            method.call(target);
+          }
+        } catch(error) {
+          onError(error, errorRecordedForStack);
+        }
+      },
+
+      flush: function(sync) {
         var queue = this._queue;
+        var length = queue.length;
+
+        if (length === 0) {
+          return;
+        }
+
         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;
+        var onError = globalOptions.onError || (globalOptions.onErrorTarget &&
+                                                globalOptions.onErrorTarget[globalOptions.onErrorMethod]);
+        var target, method, args, errorRecordedForStack;
+        var invoke = onError ? this.invokeWithOnError : this.invoke;
 
         this.targetQueues = Object.create(null);
+        var queueItems = this._queueBeingFlushed = this._queue.slice();
+        this._queue = [];
 
-        if (l && before) { before(); }
-        for (i = 0; i < l; i += 4) {
-          target = queue[i];
-          method = queue[i+1];
-          args   = queue[i+2];
-          stack  = queue[i+3]; // Debugging assistance
+        if (before) {
+          before();
+        }
 
-          // TODO: error handling
-          if (args && args.length > 0) {
-            if (onError) {
-              try {
-                method.apply(target, args);
-              } catch (e) {
-                onError(e);
-              }
-            } else {
-              method.apply(target, args);
-            }
-          } else {
-            if (onError) {
-              try {
-                method.call(target);
-              } catch(e) {
-                onError(e);
-              }
-            } else {
-              method.call(target);
-            }
+        for (var i = 0; i < length; i += 4) {
+          target                = queueItems[i];
+          method                = queueItems[i+1];
+          args                  = queueItems[i+2];
+          errorRecordedForStack = queueItems[i+3]; // Debugging assistance
+
+          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);
           }
         }
-        if (l && after) { after(); }
 
-        // check if new items have been added
-        if (queue.length > l) {
-          this._queue = queue.slice(l);
-          this.flush();
-        } else {
-          this._queue.length = 0;
+        if (after) {
+          after();
+        }
+
+        this._queueBeingFlushed = undefined;
+
+        if (sync !== false &&
+            this._queue.length > 0) {
+          // check if new items have been added
+          this.flush(true);
         }
       },
 
@@ -980,9 +959,11 @@ enifed("backburner/queue",
         // if not found in current queue
         // could be in the queue that is being flushed
         queue = this._queueBeingFlushed;
+
         if (!queue) {
           return;
         }
+
         for (i = 0, l = queue.length; i < l; i += 4) {
           currentTarget = queue[i];
           currentMethod = queue[i+1];
@@ -1222,20 +1203,6 @@ enifed("container/container",
         return container;
       },
 
-      /**
-        Sets a key-value pair on the current container. If a parent container,
-        has the same key, once set on a child, the parent and child will diverge
-        as expected.
-
-        @method set
-        @param {Object} object
-        @param {String} key
-        @param {any} value
-      */
-      set: function(object, key, value) {
-        object[key] = value;
-      },
-
       /**
         Registers a factory for later injection.
 
@@ -1485,11 +1452,13 @@ enifed("container/container",
 
       /**
         @method options
-        @param {String} type
+        @param {String} fullName
         @param {Object} options
       */
-      options: function(type, options) {
-        this.optionsForType(type, options);
+      options: function(fullName, options) {
+        options = options || {};
+        var normalizedName = this.normalize(fullName);
+        this._options[normalizedName] = options;
       },
 
       /**
@@ -1533,7 +1502,10 @@ enifed("container/container",
 
         var fullNameType = fullName.split(':')[0];
         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.');
+          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);
@@ -1596,9 +1568,13 @@ enifed("container/container",
                 var normalizedName = this.normalize(fullName);
 
         if (this.cache[normalizedName]) {
-          throw new Error("Attempted to register an injection for a type that has already been looked up. ('" + normalizedName + "', '" + property + "', '" + injectionName + "')");
+          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);
+
+        addInjection(initRules(this.injections, normalizedName), property, normalizedInjectionName);
       },
 
 
@@ -1704,7 +1680,7 @@ enifed("container/container",
             'been looked up. (\'' + normalizedName + '\', \'' + property + '\', \'' + injectionName + '\')');
         }
 
-        addInjection(this.factoryInjections, normalizedName, property, normalizedInjectionName);
+        addInjection(initRules(this.factoryInjections, normalizedName), property, normalizedInjectionName);
       },
 
       /**
@@ -1755,7 +1731,7 @@ enifed("container/container",
         return true;
       }
 
-      return !!container.resolve(fullName);
+      return container.resolve(fullName) !== undefined;
     }
 
     function lookup(container, fullName, options) {
@@ -1791,22 +1767,32 @@ enifed("container/container",
 
       if (!injections) { return hash; }
 
-      var injection, injectable;
+      validateInjections(container, injections);
+
+      var injection;
 
       for (var i = 0, length = injections.length; i < length; i++) {
         injection = injections[i];
-        injectable = lookup(container, injection.fullName);
-
-        if (injectable !== undefined) {
-          hash[injection.property] = injectable;
-        } else {
-          throw new Error('Attempting to inject an unknown injection: `' + injection.fullName + '`');
-        }
+        hash[injection.property] = lookup(container, injection.fullName);
       }
 
       return hash;
     }
 
+    function validateInjections(container, injections) {
+      if (!injections) { return; }
+
+      var fullName;
+
+      for (var i = 0, length = injections.length; i < length; i++) {
+        fullName = injections[i].fullName;
+
+        if (!container.has(fullName)) {
+          throw new Error('Attempting to inject an unknown injection: `' + fullName + '`');
+        }
+      }
+    }
+
     function option(container, fullName, optionName) {
       var options = container._options[fullName];
 
@@ -1880,8 +1866,22 @@ enifed("container/container",
       return factoryInjections;
     }
 
+    function normalizeInjectionsHash(hash) {
+      var injections = [];
+
+      for (var key in hash) {
+        if (hash.hasOwnProperty(key)) {
+          
+          addInjection(injections, key, hash[key]);
+        }
+      }
+
+      return injections;
+    }
+
     function instantiate(container, fullName) {
       var factory = factoryFor(container, fullName);
+      var lazyInjections;
 
       if (option(container, fullName, 'instantiate') === false) {
         return factory;
@@ -1893,6 +1893,7 @@ enifed("container/container",
             'Most likely an improperly defined class or an invalid module export.');
         }
 
+        
         if (typeof factory.extend === 'function') {
           // assume the factory was extendable and is already injected
           return factory.create();
@@ -1950,8 +1951,11 @@ enifed("container/container",
       return true;
     }
 
-    function addInjection(rules, factoryName, property, injectionName) {
-      var injections = rules[factoryName] = rules[factoryName] || [];
+    function initRules(rules, factoryName) {
+      return rules[factoryName] || (rules[factoryName] = []);
+    }
+
+    function addInjection(injections, property, injectionName) {
       injections.push({
         property: property,
         fullName: injectionName
@@ -1960,9 +1964,208 @@ enifed("container/container",
 
     __exports__["default"] = Container;
   });
+enifed("dag-map",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    function visit(vertex, fn, visited, path) {
+      var name = vertex.name;
+      var vertices = vertex.incoming;
+      var names = vertex.incomingNames;
+      var len = names.length;
+      var i;
+
+      if (!visited) {
+        visited = {};
+      }
+      if (!path) {
+        path = [];
+      }
+      if (visited.hasOwnProperty(name)) {
+        return;
+      }
+      path.push(name);
+      visited[name] = true;
+      for (i = 0; i < len; i++) {
+        visit(vertices[names[i]], fn, visited, path);
+      }
+      fn(vertex, path);
+      path.pop();
+    }
+
+
+    /**
+     * DAG stands for Directed acyclic graph.
+     *
+     * It is used to build a graph of dependencies checking that there isn't circular
+     * dependencies. p.e Registering initializers with a certain precedence order.
+     *
+     * @class DAG
+     * @constructor
+     */
+    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;
+    }
+
+    /**
+     * Adds a vertex entry to the graph unless it is already added.
+     *
+     * @private
+     * @method add
+     * @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) {
+        return this.vertices[name];
+      }
+      var vertex = new Vertex(name);
+      this.vertices[name] = vertex;
+      this.names.push(name);
+      return vertex;
+    };
+
+    /**
+     * Adds a vertex to the graph and sets its value.
+     *
+     * @private
+     * @method map
+     * @param {String} name The name of the vertex.
+     * @param         value The value to put in the vertex.
+     */
+    DAG.prototype.map = function(name, value) {
+      this.add(name).value = value;
+    };
+
+    /**
+     * Connects the vertices with the given names, adding them to the graph if
+     * necessary, only if this does not produce is any circular dependency.
+     *
+     * @private
+     * @method addEdge
+     * @param {String} fromName The name the vertex where the edge starts.
+     * @param {String} toName The name the vertex where the edge ends.
+     */
+    DAG.prototype.addEdge = function(fromName, toName) {
+      if (!fromName || !toName || fromName === toName) {
+        return;
+      }
+      var from = this.add(fromName);
+      var to = this.add(toName);
+      if (to.incoming.hasOwnProperty(fromName)) {
+        return;
+      }
+      function checkCycle(vertex, path) {
+        if (vertex.name === toName) {
+          throw new Error("cycle detected: " + toName + " <- " + path.join(" <- "));
+        }
+      }
+      visit(from, checkCycle);
+      from.hasOutgoing = true;
+      to.incoming[fromName] = from;
+      to.incomingNames.push(fromName);
+    };
+
+    /**
+     * Visits all the vertex of the graph calling the given function with each one,
+     * ensuring that the vertices are visited respecting their precedence.
+     *
+     * @method  topsort
+     * @param {Function} fn The function to be invoked on each vertex.
+     */
+    DAG.prototype.topsort = function(fn) {
+      var visited = {};
+      var vertices = this.vertices;
+      var names = this.names;
+      var len = names.length;
+      var i, vertex;
+
+      for (i = 0; i < len; i++) {
+        vertex = vertices[names[i]];
+        if (!vertex.hasOutgoing) {
+          visit(vertex, fn, visited);
+        }
+      }
+    };
+
+    /**
+     * Adds a vertex with the given name and value to the graph and joins it with the
+     * vertices referenced in _before_ and _after_. If there isn't vertices with those
+     * names, they are added too.
+     *
+     * If either _before_ or _after_ are falsy/empty, the added vertex will not have
+     * an incoming/outgoing edge.
+     *
+     * @method addEdges
+     * @param {String} name The name of the vertex to be added.
+     * @param         value The value of that vertex.
+     * @param        before An string or array of strings with the names of the vertices before
+     *                      which this vertex must be visited.
+     * @param         after An string or array of strings with the names of the vertex after
+     *                      which this vertex must be visited.
+     *
+     */
+    DAG.prototype.addEdges = function(name, value, before, after) {
+      var i;
+      this.map(name, value);
+      if (before) {
+        if (typeof before === 'string') {
+          this.addEdge(name, before);
+        } else {
+          for (i = 0; i < before.length; i++) {
+            this.addEdge(name, before[i]);
+          }
+        }
+      }
+      if (after) {
+        if (typeof after === 'string') {
+          this.addEdge(after, name);
+        } else {
+          for (i = 0; i < after.length; i++) {
+            this.addEdge(after[i], name);
+          }
+        }
+      }
+    };
+
+    __exports__["default"] = DAG;
+  });
+enifed("dag-map.umd",
+  ["./dag-map"],
+  function(__dependency1__) {
+    "use strict";
+    var DAG = __dependency1__["default"];
+
+    /* global define:true module:true window: true */
+    if (typeof enifed === 'function' && enifed.amd) {
+      enifed(function() { return DAG; });
+    } else if (typeof module !== 'undefined' && module.exports) {
+      module.exports = DAG;
+    } else if (typeof this !== 'undefined') {
+      this['DAG'] = DAG;
+    }
+  });
 enifed("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__) {
+  ["ember-metal/core","ember-runtime/system/lazy_load","ember-application/system/resolver","ember-application/system/application","ember-application/ext/controller"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var runLoadHooks = __dependency2__.runLoadHooks;
@@ -1975,22 +2178,20 @@ enifed("ember-application",
     @requires ember-views, ember-routing
     */
 
-    var DAG = __dependency3__["default"];
-    var Resolver = __dependency4__.Resolver;
-    var DefaultResolver = __dependency4__["default"];
-    var Application = __dependency5__["default"];
+    var Resolver = __dependency3__.Resolver;
+    var DefaultResolver = __dependency3__["default"];
+    var Application = __dependency4__["default"];
     // side effect of extending ControllerMixin
 
     Ember.Application = Application;
-    Ember.DAG = DAG;
     Ember.Resolver = Resolver;
     Ember.DefaultResolver = DefaultResolver;
 
     runLoadHooks('Ember.Application', Application);
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/property_get","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__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -2000,13 +2201,12 @@ enifed("ember-application/ext/controller",
     var Ember = __dependency1__["default"];
     // Ember.assert
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var EmberError = __dependency4__["default"];
-    var inspect = __dependency5__.inspect;
-    var computed = __dependency6__.computed;
-    var ControllerMixin = __dependency7__["default"];
-    var meta = __dependency5__.meta;
-    var controllerFor = __dependency8__["default"];
+    var EmberError = __dependency3__["default"];
+    var inspect = __dependency4__.inspect;
+    var computed = __dependency5__.computed;
+    var ControllerMixin = __dependency6__["default"];
+    var meta = __dependency4__.meta;
+    var controllerFor = __dependency7__["default"];
 
     function verifyNeedsDependencies(controller, container, needs) {
       var dependency, i, l;
@@ -2026,7 +2226,8 @@ enifed("ember-application/ext/controller",
         }
       }
       if (missing.length) {
-        throw new EmberError(inspect(controller) + " needs [ " + missing.join(', ') + " ] but " + (missing.length > 1 ? 'they' : 'it') + " could not be found");
+        throw new EmberError(inspect(controller) + " needs [ " + missing.join(', ') +
+                             " ] but " + (missing.length > 1 ? 'they' : 'it') + " could not be found");
       }
     }
 
@@ -2047,7 +2248,12 @@ enifed("ember-application/ext/controller",
             }
           }
 
-          var errorMessage = inspect(controller) + '#needs does not include `' + controllerName + '`. To access the ' + controllerName + ' controller from ' + inspect(controller) + ', ' + inspect(controller) + ' should have a `needs` property that is an array of the controllers it has access to.';
+          var errorMessage = inspect(controller) + '#needs does not include `' +
+                             controllerName + '`. To access the ' +
+                             controllerName + ' controller from ' +
+                             inspect(controller) + ', ' +
+                             inspect(controller) +
+                             ' should have a `needs` property that is an array of the controllers it has access to.';
           throw new ReferenceError(errorMessage);
         },
         setUnknownProperty: function (key, value) {
@@ -2163,34 +2369,34 @@ 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__) {
+  ["dag-map","container/container","ember-metal","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-runtime/system/namespace","ember-runtime/mixins/deferred","ember-application/system/resolver","ember-metal/platform","ember-metal/run_loop","ember-metal/utils","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-extension-support/container_debug_adapter","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__, __dependency29__, __exports__) {
     "use strict";
     /**
     @module ember
     @submodule ember-application
     */
+    var DAG = __dependency1__["default"];
+    var Container = __dependency2__["default"];
 
-    var Ember = __dependency1__["default"];
+
+    var Ember = __dependency3__["default"];
     // Ember.FEATURES, Ember.deprecate, Ember.assert, Ember.libraries, LOG_VERSION, Namespace, BOOTED
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var runLoadHooks = __dependency4__.runLoadHooks;
-    var DAG = __dependency5__["default"];
-    var Namespace = __dependency6__["default"];
-    var DeferredMixin = __dependency7__["default"];
-    var DefaultResolver = __dependency8__["default"];
-    var create = __dependency9__.create;
-    var run = __dependency10__["default"];
-    var canInvoke = __dependency11__.canInvoke;
-    var Container = __dependency12__["default"];
+    var get = __dependency4__.get;
+    var set = __dependency5__.set;
+    var runLoadHooks = __dependency6__.runLoadHooks;
+    var Namespace = __dependency7__["default"];
+    var DeferredMixin = __dependency8__["default"];
+    var DefaultResolver = __dependency9__["default"];
+    var create = __dependency10__.create;
+    var run = __dependency11__["default"];
+    var canInvoke = __dependency12__.canInvoke;
     var Controller = __dependency13__["default"];
     var EnumerableUtils = __dependency14__["default"];
     var ObjectController = __dependency15__["default"];
     var ArrayController = __dependency16__["default"];
     var SelectView = __dependency17__["default"];
     var EventDispatcher = __dependency18__["default"];
-    //import ContainerDebugAdapter from "ember-extension-support/container_debug_adapter";
     var jQuery = __dependency19__["default"];
     var Route = __dependency20__["default"];
     var Router = __dependency21__["default"];
@@ -2200,10 +2406,16 @@ enifed("ember-application/system/application",
     var NoneLocation = __dependency25__["default"];
     var BucketCache = __dependency26__["default"];
 
-    var K = __dependency27__.K;
-    var EmberHandlebars = __dependency28__["default"];
+    // this is technically incorrect (per @wycats)
+    // it should work properly with:
+    // `import ContainerDebugAdapter from 'ember-extension-support/container_debug_adapter';` but
+    // es6-module-transpiler 0.4.0 eagerly grabs the module (which is undefined)
+
+    var ContainerDebugAdapter = __dependency27__["default"];
+
+    var K = __dependency28__.K;
+    var EmberHandlebars = __dependency29__["default"];
 
-    var ContainerDebugAdapter;
     function props(obj) {
       var properties = [];
 
@@ -2275,10 +2487,10 @@ enifed("ember-application/system/application",
       names by setting the application's `customEvents` property:
 
       ```javascript
-      App = Ember.Application.create({
+      var App = Ember.Application.create({
         customEvents: {
           // add support for the paste event
-          paste: "paste"
+          paste: 'paste'
         }
       });
       ```
@@ -2292,7 +2504,7 @@ enifed("ember-application/system/application",
       should be delegated, set your application's `rootElement` property:
 
       ```javascript
-      window.App = Ember.Application.create({
+      var App = Ember.Application.create({
         rootElement: '#ember-app'
       });
       ```
@@ -2335,7 +2547,7 @@ enifed("ember-application/system/application",
       the `LOG_TRANSITIONS_INTERNAL` flag:
 
       ```javascript
-      window.App = Ember.Application.create({
+      var App = Ember.Application.create({
         LOG_TRANSITIONS: true, // basic logging of successful transitions
         LOG_TRANSITIONS_INTERNAL: true // detailed logging of all routing steps
       });
@@ -2404,10 +2616,10 @@ enifed("ember-application/system/application",
         corresponding view method name as the value. For example:
 
         ```javascript
-        App = Ember.Application.create({
+        var App = Ember.Application.create({
           customEvents: {
             // add support for the paste event
-            paste: "paste"
+            paste: 'paste'
           }
         });
         ```
@@ -2423,7 +2635,9 @@ enifed("ember-application/system/application",
       _readinessDeferrals: 1,
 
       init: function() {
-        if (!this.$) { this.$ = jQuery; }
+        if (!this.$) {
+          this.$ = jQuery;
+        }
         this.__container__ = this.buildContainer();
 
         this.Router = this.defaultRouter();
@@ -2532,10 +2746,11 @@ enifed("ember-application/system/application",
         Example:
 
         ```javascript
-        App = Ember.Application.create();
+        var App = Ember.Application.create();
+        
         App.deferReadiness();
-
-        jQuery.getJSON("/auth-token", function(token) {
+        // Ember.$ is a reference to the jQuery object/function
+        Ember.$.getJSON('/auth-token', function(token) {
           App.token = token;
           App.advanceReadiness();
         });
@@ -2578,7 +2793,8 @@ enifed("ember-application/system/application",
 
         ```javascript
         var App = Ember.Application.create();
-        App.Orange  = Ember.Object.extend();
+        
+        App.Orange = Ember.Object.extend();
         App.register('fruit:favorite', App.Orange);
         ```
 
@@ -2589,8 +2805,8 @@ enifed("ember-application/system/application",
         An example of registering a controller with a non-standard name:
 
         ```javascript
-        var App = Ember.Application.create(),
-            Session  = Ember.Controller.extend();
+        var App = Ember.Application.create();
+        var Session = Ember.Controller.extend();
 
         App.register('controller:session', Session);
 
@@ -2615,10 +2831,10 @@ enifed("ember-application/system/application",
         App.Email   = Ember.Object.extend();
         App.session = Ember.Object.create();
 
-        App.register('model:user', App.Person, {singleton: false });
+        App.register('model:user', App.Person, { singleton: false });
         App.register('fruit:favorite', App.Orange);
-        App.register('communication:main', App.Email, {singleton: false});
-        App.register('session', App.session, {instantiate: false});
+        App.register('communication:main', App.Email, { singleton: false });
+        App.register('session', App.session, { instantiate: false });
         ```
 
         @method register
@@ -2642,8 +2858,8 @@ enifed("ember-application/system/application",
         An example of providing a session object to all controllers:
 
         ```javascript
-        var App = Ember.Application.create(),
-            Session = Ember.Object.extend({ isAuthenticated: false });
+        var App = Ember.Application.create();
+        var Session = Ember.Object.extend({ isAuthenticated: false });
 
         // A factory must be registered before it can be injected
         App.register('session:main', Session);
@@ -2670,7 +2886,7 @@ enifed("ember-application/system/application",
         directly (via `create` or `new`) bypasses the dependency injection
         system.
 
-        Ember-Data instantiates its models in a unique manner, and consequently
+        **Note:** Ember-Data instantiates its models in a unique manner, and consequently
         injections onto models (or all models) will not work as expected. Injections
         on models can be enabled by setting `Ember.MODEL_FACTORY_INJECTIONS`
         to `true`.
@@ -2741,24 +2957,23 @@ enifed("ember-application/system/application",
         Typical Example:
 
         ```javascript
-
         var App;
 
         run(function() {
           App = Ember.Application.create();
         });
 
-        module("acceptance test", {
+        module('acceptance test', {
           setup: function() {
             App.reset();
           }
         });
 
-        test("first test", function() {
+        test('first test', function() {
           // App is freshly reset
         });
 
-        test("first test", function() {
+        test('second test', function() {
           // App is again freshly reset
         });
         ```
@@ -2770,14 +2985,13 @@ enifed("ember-application/system/application",
         to the app becoming ready.
 
         ```javascript
-
         var App;
 
         run(function() {
           App = Ember.Application.create();
         });
 
-        module("acceptance test", {
+        module('acceptance test', {
           setup: function() {
             run(function() {
               App.reset();
@@ -2786,12 +3000,13 @@ enifed("ember-application/system/application",
           }
         });
 
-        test("first test", function() {
+        test('first test', function() {
           ok(true, 'something before app is initialized');
 
           run(function() {
             App.advanceReadiness();
           });
+          
           ok(true, 'something after app is initialized');
         });
         ```
@@ -2827,7 +3042,7 @@ enifed("ember-application/system/application",
         var container = this.__container__;
         var graph = new DAG();
         var namespace = this;
-        var name, initializer;
+        var initializer;
 
         for (var i = 0; i < initializers.length; i++) {
           initializer = initializersByName[initializers[i]];
@@ -2958,8 +3173,9 @@ enifed("ember-application/system/application",
         ```javascript
         Ember.Application.initializer({
           name: 'namedInitializer',
+          
           initialize: function(container, application) {
-            Ember.debug("Running namedInitializer!");
+            Ember.debug('Running namedInitializer!');
           }
         });
         ```
@@ -2973,8 +3189,9 @@ enifed("ember-application/system/application",
         ```javascript
         Ember.Application.initializer({
           name: 'first',
+          
           initialize: function(container, application) {
-            Ember.debug("First initializer!");
+            Ember.debug('First initializer!');
           }
         });
 
@@ -2990,7 +3207,7 @@ enifed("ember-application/system/application",
           after: 'first',
 
           initialize: function(container, application) {
-            Ember.debug("Second initializer!");
+            Ember.debug('Second initializer!');
           }
         });
 
@@ -3007,7 +3224,7 @@ enifed("ember-application/system/application",
           before: 'first',
 
           initialize: function(container, application) {
-            Ember.debug("Pre initializer!");
+            Ember.debug('Pre initializer!');
           }
         });
 
@@ -3025,7 +3242,7 @@ enifed("ember-application/system/application",
           after: ['first', 'second'],
 
           initialize: function(container, application) {
-            Ember.debug("Post initializer!");
+            Ember.debug('Post initializer!');
           }
         });
 
@@ -3042,10 +3259,11 @@ enifed("ember-application/system/application",
 
         ```javascript
         Ember.Application.initializer({
-          name: "preload-data",
+          name: 'preload-data',
 
           initialize: function(container, application) {
             var store = container.lookup('store:main');
+            
             store.pushPayload(preloadedData);
           }
         });
@@ -3077,7 +3295,7 @@ enifed("ember-application/system/application",
           });
         }
 
-                
+                        
         this.initializers[initializer.name] = initializer;
       },
 
@@ -3156,8 +3374,6 @@ enifed("ember-application/system/application",
         container.injection('data-adapter:main', 'containerDebugAdapter', 'container-debug-adapter:main');
         // Custom resolver authors may want to register their own ContainerDebugAdapter with this key
 
-        // ES6TODO: resolve this via import once ember-application package is ES6'ed
-        if (!ContainerDebugAdapter) { ContainerDebugAdapter = requireModule('ember-extension-support/container_debug_adapter')['default']; }
         container.register('container-debug-adapter:main', ContainerDebugAdapter);
 
         return container;
@@ -3216,192 +3432,6 @@ enifed("ember-application/system/application",
 
     __exports__["default"] = Application;
   });
-enifed("ember-application/system/dag",
-  ["ember-metal/error","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var EmberError = __dependency1__["default"];
-
-    function visit(vertex, fn, visited, path) {
-      var name = vertex.name;
-      var vertices = vertex.incoming;
-      var names = vertex.incomingNames;
-      var len = names.length;
-      var i;
-
-      if (!visited) {
-        visited = {};
-      }
-      if (!path) {
-        path = [];
-      }
-      if (visited.hasOwnProperty(name)) {
-        return;
-      }
-      path.push(name);
-      visited[name] = true;
-      for (i = 0; i < len; i++) {
-        visit(vertices[names[i]], fn, visited, path);
-      }
-      fn(vertex, path);
-      path.pop();
-    }
-
-
-    /**
-     * DAG stands for Directed acyclic graph.
-     *
-     * It is used to build a graph of dependencies checking that there isn't circular
-     * dependencies. p.e Registering initializers with a certain precedence order.
-     *
-     * @class DAG
-     * @constructor
-     */
-    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;
-    }
-
-    /**
-     * Adds a vertex entry to the graph unless it is already added.
-     *
-     * @private
-     * @method add
-     * @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) {
-        return this.vertices[name];
-      }
-      var vertex = new Vertex(name);
-      this.vertices[name] = vertex;
-      this.names.push(name);
-      return vertex;
-    };
-
-    /**
-     * Adds a vertex to the graph and sets its value.
-     *
-     * @private
-     * @method map
-     * @param {String} name The name of the vertex.
-     * @param         value The value to put in the vertex.
-     */
-    DAG.prototype.map = function(name, value) {
-      this.add(name).value = value;
-    };
-
-    /**
-     * Connects the vertices with the given names, adding them to the graph if
-     * necessary, only if this does not produce is any circular dependency.
-     *
-     * @private
-     * @method addEdge
-     * @param {String} fromName The name the vertex where the edge starts.
-     * @param {String} toName The name the vertex where the edge ends.
-     */
-    DAG.prototype.addEdge = function(fromName, toName) {
-      if (!fromName || !toName || fromName === toName) {
-        return;
-      }
-      var from = this.add(fromName);
-      var to = this.add(toName);
-      if (to.incoming.hasOwnProperty(fromName)) {
-        return;
-      }
-      function checkCycle(vertex, path) {
-        if (vertex.name === toName) {
-          throw new EmberError("cycle detected: " + toName + " <- " + path.join(" <- "));
-        }
-      }
-      visit(from, checkCycle);
-      from.hasOutgoing = true;
-      to.incoming[fromName] = from;
-      to.incomingNames.push(fromName);
-    };
-
-    /**
-     * Visits all the vertex of the graph calling the given function with each one,
-     * ensuring that the vertices are visited respecting their precedence.
-     *
-     * @method  topsort
-     * @param {Function} fn The function to be invoked on each vertex.
-     */
-    DAG.prototype.topsort = function(fn) {
-      var visited = {};
-      var vertices = this.vertices;
-      var names = this.names;
-      var len = names.length;
-      var i, vertex;
-
-      for (i = 0; i < len; i++) {
-        vertex = vertices[names[i]];
-        if (!vertex.hasOutgoing) {
-          visit(vertex, fn, visited);
-        }
-      }
-    };
-
-    /**
-     * Adds a vertex with the given name and value to the graph and joins it with the
-     * vertices referenced in _before_ and _after_. If there isn't vertices with those
-     * names, they are added too.
-     *
-     * If either _before_ or _after_ are falsy/empty, the added vertex will not have
-     * an incoming/outgoing edge.
-     *
-     * @method addEdges
-     * @param {String} name The name of the vertex to be added.
-     * @param         value The value of that vertex.
-     * @param        before An string or array of strings with the names of the vertices before
-     *                      which this vertex must be visited.
-     * @param         after An string or array of strings with the names of the vertex after
-     *                      which this vertex must be visited.
-     *
-     */
-    DAG.prototype.addEdges = function(name, value, before, after) {
-      var i;
-      this.map(name, value);
-      if (before) {
-        if (typeof before === 'string') {
-          this.addEdge(name, before);
-        } else {
-          for (i = 0; i < before.length; i++) {
-            this.addEdge(name, before[i]);
-          }
-        }
-      }
-      if (after) {
-        if (typeof after === 'string') {
-          this.addEdge(after, name);
-        } else {
-          for (i = 0; i < after.length; i++) {
-            this.addEdge(after[i], name);
-          }
-        }
-      }
-    };
-
-    __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__) {
@@ -3483,26 +3513,26 @@ enifed("ember-application/system/resolver",
       Some examples of how names are resolved:
 
       ```
-      'template:post' //=> Ember.TEMPLATES['post']
-      'template:posts/byline' //=> Ember.TEMPLATES['posts/byline']
-      'template:posts.byline' //=> Ember.TEMPLATES['posts/byline']
-      'template:blogPost' //=> Ember.TEMPLATES['blogPost']
-                          //   OR
-                          //   Ember.TEMPLATES['blog_post']
-      'controller:post' //=> App.PostController
-      'controller:posts.index' //=> App.PostsIndexController
-      'controller:blog/post' //=> Blog.PostController
-      'controller:basic' //=> Ember.Controller
-      'route:post' //=> App.PostRoute
-      'route:posts.index' //=> App.PostsIndexRoute
-      'route:blog/post' //=> Blog.PostRoute
-      'route:basic' //=> Ember.Route
-      'view:post' //=> App.PostView
-      'view:posts.index' //=> App.PostsIndexView
-      'view:blog/post' //=> Blog.PostView
-      'view:basic' //=> Ember.View
-      'foo:post' //=> App.PostFoo
-      'model:post' //=> App.Post
+      'template:post'           //=> Ember.TEMPLATES['post']
+      'template:posts/byline'   //=> Ember.TEMPLATES['posts/byline']
+      'template:posts.byline'   //=> Ember.TEMPLATES['posts/byline']
+      'template:blogPost'       //=> Ember.TEMPLATES['blogPost']
+                                //   OR
+                                //   Ember.TEMPLATES['blog_post']
+      'controller:post'         //=> App.PostController
+      'controller:posts.index'  //=> App.PostsIndexController
+      'controller:blog/post'    //=> Blog.PostController
+      'controller:basic'        //=> Ember.Controller
+      'route:post'              //=> App.PostRoute
+      'route:posts.index'       //=> App.PostsIndexRoute
+      'route:blog/post'         //=> Blog.PostRoute
+      'route:basic'             //=> Ember.Route
+      'view:post'               //=> App.PostView
+      'view:posts.index'        //=> App.PostsIndexView
+      'view:blog/post'          //=> Blog.PostView
+      'view:basic'              //=> Ember.View
+      'foo:post'                //=> App.PostFoo
+      'model:post'              //=> App.Post
       ```
 
       @class DefaultResolver
@@ -3902,7 +3932,7 @@ enifed("ember-extension-support/container_debug_adapter",
         @return {Array} An array of strings.
       */
       catalogEntriesByType: function(type) {
-        var namespaces = emberA(Namespace.NAMESPACES), types = emberA(), self = this;
+        var namespaces = emberA(Namespace.NAMESPACES), types = emberA();
         var typeSuffixRegex = new RegExp(classify(type) + "$");
 
         namespaces.forEach(function(namespace) {
@@ -4246,8 +4276,7 @@ enifed("ember-extension-support/data_adapter",
       */
       wrapModelType: function(type, name) {
         var records = this.getRecords(type);
-        var self = this;
-        var release, typeToSend;
+        var typeToSend;
 
         typeToSend = {
           name: name || type.toString(),
@@ -4348,8 +4377,6 @@ enifed("ember-extension-support/data_adapter",
       */
       wrapRecord: function(record) {
         var recordToSend = { object: record };
-        var columnValues = {};
-        var self = this;
 
         recordToSend.columnValues = this.getRecordColumnValues(record);
         recordToSend.searchKeywords = this.getRecordKeywords(record);
@@ -4481,7 +4508,7 @@ enifed("ember-handlebars-compiler",
       @class Handlebars
       @namespace Ember
     */
-    var EmberHandlebars = Ember.Handlebars = objectCreate(Handlebars);
+    var EmberHandlebars = Ember.Handlebars = Handlebars.create();
 
     /**
       Register a bound helper or custom view helper.
@@ -4623,44 +4650,6 @@ enifed("ember-handlebars-compiler",
       return "data.buffer.push("+string+");";
     };
 
-    // Hacks ahead:
-    // Handlebars presently has a bug where the `blockHelperMissing` hook
-    // doesn't get passed the name of the missing helper name, but rather
-    // gets passed the value of that missing helper evaluated on the current
-    // context, which is most likely `undefined` and totally useless.
-    //
-    // So we alter the compiled template function to pass the name of the helper
-    // instead, as expected.
-    //
-    // 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]+)(,.*)/;
-
-    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);
-
-      source[source.length - 1] = matches[1] + "'" + helperName + "'" + matches[3];
-    };
-
-    var stringifyBlockHelperMissing = EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation;
-
-    var originalBlockValue = EmberHandlebars.JavaScriptCompiler.prototype.blockValue;
-    EmberHandlebars.JavaScriptCompiler.prototype.blockValue = function() {
-      originalBlockValue.apply(this, arguments);
-      stringifyBlockHelperMissing(this.source);
-    };
-
-    var originalAmbiguousBlockValue = EmberHandlebars.JavaScriptCompiler.prototype.ambiguousBlockValue;
-    EmberHandlebars.JavaScriptCompiler.prototype.ambiguousBlockValue = function() {
-      originalAmbiguousBlockValue.apply(this, arguments);
-      stringifyBlockHelperMissing(this.source);
-    };
-
     /**
       Rewrite simple mustaches from `{{foo}}` to `{{bind "foo"}}`. This means that
       all simple mustaches in Ember's Handlebars will also set up an observer to
@@ -4750,8 +4739,8 @@ enifed("ember-handlebars-compiler",
     __exports__["default"] = EmberHandlebars;
   });
 enifed("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__) {
+  ["ember-handlebars-compiler","ember-metal/core","ember-runtime/system/lazy_load","ember-handlebars/loader","ember-handlebars/ext","ember-handlebars/string","ember-handlebars/helpers/binding","ember-handlebars/helpers/if_unless","ember-handlebars/helpers/with","ember-handlebars/helpers/bind_attr","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__, __dependency27__, __dependency28__, __exports__) {
     "use strict";
     var EmberHandlebars = __dependency1__["default"];
     var Ember = __dependency2__["default"];
@@ -4760,68 +4749,61 @@ enifed("ember-handlebars",
     var runLoadHooks = __dependency3__.runLoadHooks;
     var bootstrap = __dependency4__["default"];
 
-    var normalizePath = __dependency5__.normalizePath;
-    var template = __dependency5__.template;
     var makeBoundHelper = __dependency5__.makeBoundHelper;
     var registerBoundHelper = __dependency5__.registerBoundHelper;
-    var resolveHash = __dependency5__.resolveHash;
-    var resolveParams = __dependency5__.resolveParams;
-    var getEscaped = __dependency5__.getEscaped;
-    var handlebarsGet = __dependency5__.handlebarsGet;
-    var evaluateUnboundHelper = __dependency5__.evaluateUnboundHelper;
     var helperMissingHelper = __dependency5__.helperMissingHelper;
     var blockHelperMissingHelper = __dependency5__.blockHelperMissingHelper;
+    var handlebarsGet = __dependency5__.handlebarsGet;
 
 
     // side effect of extending StringUtils of htmlSafe
 
-    var resolvePaths = __dependency7__["default"];
-    var bind = __dependency8__.bind;
-    var _triageMustacheHelper = __dependency8__._triageMustacheHelper;
-    var resolveHelper = __dependency8__.resolveHelper;
-    var bindHelper = __dependency8__.bindHelper;
+    var bind = __dependency7__.bind;
+    var _triageMustacheHelper = __dependency7__._triageMustacheHelper;
+    var resolveHelper = __dependency7__.resolveHelper;
+    var bindHelper = __dependency7__.bindHelper;
+
+    var ifHelper = __dependency8__.ifHelper;
     var boundIfHelper = __dependency8__.boundIfHelper;
     var unboundIfHelper = __dependency8__.unboundIfHelper;
-    var withHelper = __dependency8__.withHelper;
-    var ifHelper = __dependency8__.ifHelper;
     var unlessHelper = __dependency8__.unlessHelper;
-    var bindAttrHelper = __dependency8__.bindAttrHelper;
-    var bindAttrHelperDeprecated = __dependency8__.bindAttrHelperDeprecated;
-    var bindClasses = __dependency8__.bindClasses;
 
-    var collectionHelper = __dependency9__["default"];
-    var ViewHelper = __dependency10__.ViewHelper;
-    var viewHelper = __dependency10__.viewHelper;
-    var unboundHelper = __dependency11__["default"];
-    var logHelper = __dependency12__.logHelper;
-    var debuggerHelper = __dependency12__.debuggerHelper;
-    var EachView = __dependency13__.EachView;
-    var GroupedEach = __dependency13__.GroupedEach;
-    var eachHelper = __dependency13__.eachHelper;
-    var templateHelper = __dependency14__["default"];
-    var partialHelper = __dependency15__["default"];
-    var yieldHelper = __dependency16__["default"];
-    var locHelper = __dependency17__["default"];
+    var withHelper = __dependency9__["default"];
+
+    var bindAttrHelper = __dependency10__.bindAttrHelper;
+    var bindAttrHelperDeprecated = __dependency10__.bindAttrHelperDeprecated;
+    var bindClasses = __dependency10__.bindClasses;
+
+    var collectionHelper = __dependency11__["default"];
+    var ViewHelper = __dependency12__.ViewHelper;
+    var viewHelper = __dependency12__.viewHelper;
+    var unboundHelper = __dependency13__["default"];
+    var logHelper = __dependency14__.logHelper;
+    var debuggerHelper = __dependency14__.debuggerHelper;
+    var EachView = __dependency15__.EachView;
+    var eachHelper = __dependency15__.eachHelper;
+    var templateHelper = __dependency16__["default"];
+    var partialHelper = __dependency17__["default"];
+    var yieldHelper = __dependency18__["default"];
+    var locHelper = __dependency19__["default"];
 
 
-    var Checkbox = __dependency18__["default"];
-    var Select = __dependency19__.Select;
-    var SelectOption = __dependency19__.SelectOption;
-    var SelectOptgroup = __dependency19__.SelectOptgroup;
-    var TextArea = __dependency20__["default"];
-    var TextField = __dependency21__["default"];
-    var TextSupport = __dependency22__["default"];
-    var inputHelper = __dependency23__.inputHelper;
-    var textareaHelper = __dependency23__.textareaHelper;
+    var Checkbox = __dependency20__["default"];
+    var Select = __dependency21__.Select;
+    var SelectOption = __dependency21__.SelectOption;
+    var SelectOptgroup = __dependency21__.SelectOptgroup;
+    var TextArea = __dependency22__["default"];
+    var TextField = __dependency23__["default"];
+    var TextSupport = __dependency24__["default"];
+    var inputHelper = __dependency25__.inputHelper;
+    var textareaHelper = __dependency25__.textareaHelper;
 
-
-    var ComponentLookup = __dependency24__["default"];
-    var _HandlebarsBoundView = __dependency25__._HandlebarsBoundView;
-    var SimpleHandlebarsView = __dependency25__.SimpleHandlebarsView;
-    var _wrapMap = __dependency26__._wrapMap;
-    var _SimpleMetamorphView = __dependency26__._SimpleMetamorphView;
-    var _MetamorphView = __dependency26__._MetamorphView;
-    var _Metamorph = __dependency26__._Metamorph;
+    var ComponentLookup = __dependency26__["default"];
+    var _HandlebarsBoundView = __dependency27__._HandlebarsBoundView;
+    var SimpleHandlebarsView = __dependency27__.SimpleHandlebarsView;
+    var _MetamorphView = __dependency28__["default"];
+    var _SimpleMetamorphView = __dependency28__._SimpleMetamorphView;
+    var _Metamorph = __dependency28__._Metamorph;
 
 
     /**
@@ -4834,33 +4816,24 @@ enifed("ember-handlebars",
 
     // Ember.Handlebars.Globals
     EmberHandlebars.bootstrap = bootstrap;
-    EmberHandlebars.template = template;
     EmberHandlebars.makeBoundHelper = makeBoundHelper;
     EmberHandlebars.registerBoundHelper = registerBoundHelper;
-    EmberHandlebars.resolveHash = resolveHash;
-    EmberHandlebars.resolveParams = resolveParams;
     EmberHandlebars.resolveHelper = resolveHelper;
-    EmberHandlebars.get = handlebarsGet;
-    EmberHandlebars.getEscaped = getEscaped;
-    EmberHandlebars.evaluateUnboundHelper = evaluateUnboundHelper;
     EmberHandlebars.bind = bind;
     EmberHandlebars.bindClasses = bindClasses;
     EmberHandlebars.EachView = EachView;
-    EmberHandlebars.GroupedEach = GroupedEach;
-    EmberHandlebars.resolvePaths = resolvePaths;
     EmberHandlebars.ViewHelper = ViewHelper;
-    EmberHandlebars.normalizePath = normalizePath;
 
 
     // Ember Globals
     Ember.Handlebars = EmberHandlebars;
+    EmberHandlebars.get = handlebarsGet;
     Ember.ComponentLookup = ComponentLookup;
     Ember._SimpleHandlebarsView = SimpleHandlebarsView;
     Ember._HandlebarsBoundView = _HandlebarsBoundView;
     Ember._SimpleMetamorphView = _SimpleMetamorphView;
     Ember._MetamorphView = _MetamorphView;
     Ember._Metamorph = _Metamorph;
-    Ember._metamorphWrapMap = _wrapMap;
     Ember.TextSupport = TextSupport;
     Ember.Checkbox = Checkbox;
     Ember.Select = Select;
@@ -4906,7 +4879,7 @@ enifed("ember-handlebars/component_lookup",
     "use strict";
     var EmberObject = __dependency1__["default"];
 
-    var ComponentLookup = EmberObject.extend({
+    __exports__["default"] = EmberObject.extend({
       lookupFactory: function(name, container) {
 
         container = container || this.container;
@@ -4932,12 +4905,10 @@ enifed("ember-handlebars/component_lookup",
         }
       }
     });
-
-    __exports__["default"] = ComponentLookup;
   });
 enifed("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__) {
+  ["ember-handlebars/controls/checkbox","ember-handlebars/controls/text_field","ember-handlebars/controls/text_area","ember-metal/core","ember-handlebars-compiler","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var Checkbox = __dependency1__["default"];
     var TextField = __dependency2__["default"];
@@ -4948,21 +4919,12 @@ enifed("ember-handlebars/controls",
     // var emberAssert = Ember.assert;
 
     var EmberHandlebars = __dependency5__["default"];
-    var handlebarsGet = __dependency6__.handlebarsGet;
-    var helpers = EmberHandlebars.helpers;
+
     /**
     @module ember
     @submodule ember-handlebars-compiler
     */
 
-    function _resolveOption(context, options, key) {
-      if (options.hashTypes[key] === "ID") {
-        return handlebarsGet(context, options.hash[key], options);
-      } else {
-        return options.hash[key];
-      }
-    }
-
     /**
 
       The `{{input}}` helper inserts an HTML `<input>` tag into the template,
@@ -5029,10 +4991,12 @@ enifed("ember-handlebars/controls",
       The action property defines the action which is sent when
       the user presses the return key.
 
+
       ```handlebars
       {{input action="submit"}}
       ```
 
+
       The helper allows some user events to send actions.
 
     * `enter`
@@ -5046,10 +5010,12 @@ enifed("ember-handlebars/controls",
       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.
 
+
       ```handlebars
       {{input focus-in="alertMessage"}}
       ```
 
+
       See more about [Text Support Actions](/api/classes/Ember.TextField.html)
 
       ## Extension
@@ -5141,22 +5107,29 @@ enifed("ember-handlebars/controls",
     */
     function inputHelper(options) {
       
+      var view = options.data.view;
       var hash = options.hash;
       var types = options.hashTypes;
-      var inputType = _resolveOption(this, options, 'type');
       var onEvent = hash.on;
+      var inputType;
+
+      if (types.type === 'ID') {
+        inputType = view.getStream(hash.type).value();
+      } else {
+        inputType = hash.type;
+      }
 
       if (inputType === 'checkbox') {
         delete hash.type;
         delete types.type;
 
         
-        return helpers.view.call(this, Checkbox, options);
+        return EmberHandlebars.helpers.view.call(this, Checkbox, options);
       } else {
         delete hash.on;
 
         hash.onEvent = onEvent || 'enter';
-        return helpers.view.call(this, TextField, options);
+        return EmberHandlebars.helpers.view.call(this, TextField, options);
       }
     }
 
@@ -5347,10 +5320,7 @@ enifed("ember-handlebars/controls",
     */
     function textareaHelper(options) {
       
-      var hash = options.hash;
-      var types = options.hashTypes;
-
-      return helpers.view.call(this, TextArea, options);
+      return EmberHandlebars.helpers.view.call(this, TextArea, options);
     }
 
     __exports__.textareaHelper = textareaHelper;
@@ -5458,7 +5428,6 @@ enifed("ember-handlebars/controls/select",
     var observer = __dependency11__.observer;
     var defineProperty = __dependency12__.defineProperty;
 
-    var precompileTemplate = EmberHandlebars.compile;
 
     var SelectOption = View.extend({
       instrumentDisplay: 'Ember.SelectOption',
@@ -5770,59 +5739,42 @@ enifed("ember-handlebars/controls/select",
 
       tagName: 'select',
       classNames: ['ember-select'],
-      defaultTemplate: Ember.Handlebars.template(function anonymous(Handlebars,depth0,helpers,partials,data) {
-    this.compilerInfo = [4,'>= 1.0.0'];
-    helpers = this.merge(helpers, Ember.Handlebars.helpers); data = data || {};
-      var buffer = '', stack1, escapeExpression=this.escapeExpression, self=this;
-
-    function program1(depth0,data) {
-      
-      var buffer = '', stack1;
+      defaultTemplate: Ember.Handlebars.template({"1":function(depth0,helpers,partials,data) {
+      var stack1, buffer = '';
       data.buffer.push("<option value=\"\">");
-      stack1 = helpers._triageMustache.call(depth0, "view.prompt", {hash:{},hashTypes:{},hashContexts:{},contexts:[depth0],types:["ID"],data:data});
-      if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+      stack1 = helpers._triageMustache.call(depth0, "view.prompt", {"name":"_triageMustache","hash":{},"hashTypes":{},"hashContexts":{},"types":["ID"],"contexts":[depth0],"data":data});
+      if (stack1 != null) { data.buffer.push(stack1); }
       data.buffer.push("</option>");
       return buffer;
-      }
-
-    function program3(depth0,data) {
-      
+    },"3":function(depth0,helpers,partials,data) {
       var stack1;
-      stack1 = helpers.each.call(depth0, "view.groupedContent", {hash:{},hashTypes:{},hashContexts:{},inverse:self.noop,fn:self.program(4, program4, data),contexts:[depth0],types:["ID"],data:data});
-      if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+      stack1 = helpers.each.call(depth0, "group", "in", "view.groupedContent", {"name":"each","hash":{},"hashTypes":{},"hashContexts":{},"fn":this.program(4, data),"inverse":this.noop,"types":["ID","ID","ID"],"contexts":[depth0,depth0,depth0],"data":data});
+      if (stack1 != null) { data.buffer.push(stack1); }
       else { data.buffer.push(''); }
-      }
-    function program4(depth0,data) {
-      
-      
-      data.buffer.push(escapeExpression(helpers.view.call(depth0, "view.groupView", {hash:{
-        'content': ("content"),
-        'label': ("label")
-      },hashTypes:{'content': "ID",'label': "ID"},hashContexts:{'content': depth0,'label': depth0},contexts:[depth0],types:["ID"],data:data})));
-      }
-
-    function program6(depth0,data) {
-      
+      },"4":function(depth0,helpers,partials,data) {
+      var escapeExpression=this.escapeExpression;
+      data.buffer.push(escapeExpression(helpers.view.call(depth0, "view.groupView", {"name":"view","hash":{
+        'label': ("group.label"),
+        'content': ("group.content")
+      },"hashTypes":{'label': "ID",'content': "ID"},"hashContexts":{'label': depth0,'content': depth0},"types":["ID"],"contexts":[depth0],"data":data})));
+      },"6":function(depth0,helpers,partials,data) {
       var stack1;
-      stack1 = helpers.each.call(depth0, "view.content", {hash:{},hashTypes:{},hashContexts:{},inverse:self.noop,fn:self.program(7, program7, data),contexts:[depth0],types:["ID"],data:data});
-      if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+      stack1 = helpers.each.call(depth0, "item", "in", "view.content", {"name":"each","hash":{},"hashTypes":{},"hashContexts":{},"fn":this.program(7, data),"inverse":this.noop,"types":["ID","ID","ID"],"contexts":[depth0,depth0,depth0],"data":data});
+      if (stack1 != null) { data.buffer.push(stack1); }
       else { data.buffer.push(''); }
-      }
-    function program7(depth0,data) {
-      
-      
-      data.buffer.push(escapeExpression(helpers.view.call(depth0, "view.optionView", {hash:{
-        'content': ("")
-      },hashTypes:{'content': "ID"},hashContexts:{'content': depth0},contexts:[depth0],types:["ID"],data:data})));
-      }
-
-      stack1 = helpers['if'].call(depth0, "view.prompt", {hash:{},hashTypes:{},hashContexts:{},inverse:self.noop,fn:self.program(1, program1, data),contexts:[depth0],types:["ID"],data:data});
-      if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
-      stack1 = helpers['if'].call(depth0, "view.optionGroupPath", {hash:{},hashTypes:{},hashContexts:{},inverse:self.program(6, program6, data),fn:self.program(3, program3, data),contexts:[depth0],types:["ID"],data:data});
-      if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
+      },"7":function(depth0,helpers,partials,data) {
+      var escapeExpression=this.escapeExpression;
+      data.buffer.push(escapeExpression(helpers.view.call(depth0, "view.optionView", {"name":"view","hash":{
+        'content': ("item")
+      },"hashTypes":{'content': "ID"},"hashContexts":{'content': depth0},"types":["ID"],"contexts":[depth0],"data":data})));
+      },"compiler":[6,">= 2.0.0-beta.1"],"main":function(depth0,helpers,partials,data) {
+      var stack1, buffer = '';
+      stack1 = helpers['if'].call(depth0, "view.prompt", {"name":"if","hash":{},"hashTypes":{},"hashContexts":{},"fn":this.program(1, data),"inverse":this.noop,"types":["ID"],"contexts":[depth0],"data":data});
+      if (stack1 != null) { data.buffer.push(stack1); }
+      stack1 = helpers['if'].call(depth0, "view.optionGroupPath", {"name":"if","hash":{},"hashTypes":{},"hashContexts":{},"fn":this.program(3, data),"inverse":this.program(6, data),"types":["ID"],"contexts":[depth0],"data":data});
+      if (stack1 != null) { data.buffer.push(stack1); }
       return buffer;
-      
-    }),
+    },"useData":true}),
       attributeBindings: ['multiple', 'disabled', 'tabindex', 'name', 'required', 'autofocus',
                           'form', 'size'],
 
@@ -6150,7 +6102,16 @@ 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',
+        'lang',
+        'dir'
+      ],
       rows: null,
       cols: null,
 
@@ -6170,18 +6131,15 @@ enifed("ember-handlebars/controls/text_area",
     });
   });
 enifed("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__) {
+  ["ember-views/views/component","ember-handlebars/controls/text_support","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     /**
     @module ember
     @submodule ember-handlebars
     */
-
-    var get = __dependency1__.get;
-    var set = __dependency2__.set;
-    var Component = __dependency3__["default"];
-    var TextSupport = __dependency4__["default"];
+    var Component = __dependency1__["default"];
+    var TextSupport = __dependency2__["default"];
 
     /**
 
@@ -6206,11 +6164,31 @@ enifed("ember-handlebars/controls/text_field",
 
       classNames: ['ember-text-field'],
       tagName: "input",
-      attributeBindings: ['type', 'value', 'size', 'pattern', 'name', 'min', 'max',
-                          'accept', 'autocomplete', 'autosave', 'formaction',
-                          'formenctype', 'formmethod', 'formnovalidate', 'formtarget',
-                          'height', 'inputmode', 'list', 'multiple', 'step', 'lang', 'dir',
-                          'width'],
+      attributeBindings: [
+        'accept',
+        'autocomplete',
+        'autosave',
+        'dir',
+        'formaction',
+        'formenctype',
+        'formmethod',
+        'formnovalidate',
+        'formtarget',
+        'height',
+        'inputmode',
+        'lang',
+        'list',
+        'max',
+        'min',
+        'multiple',
+        'name',
+        'pattern',
+        'size',
+        'step',
+        'type',
+        'value',
+        'width'
+      ],
 
       /**
         The `value` attribute of the input element. As the user inputs text, this
@@ -6296,21 +6274,30 @@ enifed("ember-handlebars/controls/text_support",
     var TextSupport = Mixin.create(TargetActionSupport, {
       value: "",
 
-      attributeBindings: ['placeholder', 'disabled', 'maxlength', 'tabindex', 'readonly',
-                          'autofocus', 'form', 'selectionDirection', 'spellcheck', 'required',
-                          'title', 'autocapitalize', 'autocorrect'],
+      attributeBindings: [
+        'autocapitalize',
+        'autocorrect',
+        'autofocus',
+        'disabled',
+        'form',
+        'maxlength',
+        'placeholder',
+        'readonly',
+        'required',
+        'selectionDirection',
+        'spellcheck',
+        'tabindex',
+        'title'
+      ],
       placeholder: null,
       disabled: false,
       maxlength: null,
 
       init: function() {
         this._super();
-        this.on("focusOut", this, this._elementValueDidChange);
-        this.on("change", this, this._elementValueDidChange);
         this.on("paste", this, this._elementValueDidChange);
         this.on("cut", this, this._elementValueDidChange);
         this.on("input", this, this._elementValueDidChange);
-        this.on("keyUp", this, this.interpretKeyEvents);
       },
 
       /**
@@ -6396,6 +6383,10 @@ enifed("ember-handlebars/controls/text_support",
         sendAction('escape-press', this, event);
       },
 
+      change: function(event) {
+        this._elementValueDidChange(event);
+      },
+
       /**
         Called when the text area is focused.
 
@@ -6417,6 +6408,7 @@ enifed("ember-handlebars/controls/text_support",
         @param {Event} event
       */
       focusOut: function(event) {
+        this._elementValueDidChange(event);
         sendAction('focus-out', this, event);
       },
 
@@ -6431,8 +6423,36 @@ enifed("ember-handlebars/controls/text_support",
       */
       keyPress: function(event) {
         sendAction('key-press', this, event);
-      }
+      },
 
+      /**
+        Called when the browser triggers a `keyup` event on the element.
+
+        Uses sendAction to send the `key-up` action passing the current value
+        and event as parameters.
+
+        @method keyUp
+        @param {Event} event
+      */
+      keyUp: function(event) {
+        this.interpretKeyEvents(event);
+
+        this.sendAction('key-up', get(this, 'value'), event);
+      },
+
+      /**
+        Called when the browser triggers a `keydown` event on the element.
+
+        Uses sendAction to send the `key-down` action passing the current value
+        and event as parameters. Note that generally in key-down the value is unchanged
+        (as the key pressing has not completed yet).
+
+        @method keyDown
+        @param {Event} event
+      */
+      keyDown: function(event) {
+        this.sendAction('key-down', get(this, 'value'), event);
+      }
     });
 
     TextSupport.KEY_EVENTS = {
@@ -6467,8 +6487,8 @@ 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__) {
+  ["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-metal/path_cache","ember-metal/streams/stream","ember-metal/streams/read","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.FEATURES, Ember.assert, Ember.Handlebars, Ember.lookup
@@ -6477,76 +6497,22 @@ enifed("ember-handlebars/ext",
     var fmt = __dependency2__.fmt;
 
     var EmberHandlebars = __dependency3__["default"];
-    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 detectIsGlobal = __dependency8__.isGlobal;
 
     // late bound via requireModule because of circular dependencies.
     var resolveHelper, SimpleHandlebarsView;
 
-    var isEmpty = __dependency10__["default"];
+    var Stream = __dependency9__["default"];
+    var readArray = __dependency10__.readArray;
+    var readHash = __dependency10__.readHash;
 
     var slice = [].slice;
-    var originalTemplate = EmberHandlebars.template;
-
-    /**
-      If a path starts with a reserved keyword, returns the root
-      that should be used.
-
-      @private
-      @method normalizePath
-      @for Ember
-      @param root {Object}
-      @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;
-
-      // Get the first segment of the path. For example, if the
-      // path is "foo.bar.baz", returns "foo".
-      keyword = FIRST_SEGMENT_CACHE.get(path);
-
-      // 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
-      // that object as the new root.
-      if (keywords.hasOwnProperty(keyword)) {
-        // Look up the value in the template's data hash.
-        root = keywords[keyword];
-        isKeyword = true;
-
-        // Handle cases where the entire path is the reserved
-        // word. In that case, return the object itself.
-        if (path === keyword) {
-          path = '';
-        } else {
-          // Strip the keyword from the path and look up
-          // the remainder from the newly found root.
-          path = path.substr(keyword.length+1);
-        }
-      }
-
-      return {
-        root: root,
-        path: path,
-        isKeyword: isKeyword
-      };
-    }
-
 
     /**
       Lookup both on root and on window. If the path starts with
@@ -6558,50 +6524,11 @@ enifed("ember-handlebars/ext",
       @param {Object} root The object to look up the property on
       @param {String} path The path to be lookedup
       @param {Object} options The template's option hash
+      @deprecated
     */
     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;
-      }
+      
+      return options.data.view.getStream(path).value();
     }
 
     /**
@@ -6628,41 +6555,28 @@ enifed("ember-handlebars/ext",
       @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
+      @param {Object} data The template's data hash
     */
-    function handlebarsGetView(context, path, container, options) {
+    function handlebarsGetView(context, path, container, data) {
       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 (!data) {
+          throw new Error("handlebarsGetView: must pass data");
         }
 
-        if(!viewClass) {
-          viewClass = lookupViewByClassName(path);
+        // Only lookup view class on context if there is a context. If not,
+        // the global lookup path on get may kick in.
+        var lazyValue = data.view.getStream(path);
+        viewClass = lazyValue.value();
+        var isGlobal = detectIsGlobal(path);
+
+        if (!viewClass && !isGlobal) {
+                    viewClass = container.lookupFactory('view:'+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);
+        if (!viewClass && isGlobal) {
+          var globalViewClass = get(path);
+                    if (globalViewClass) {
+            viewClass = globalViewClass;
           }
         }
       } else {
@@ -6671,80 +6585,28 @@ enifed("ember-handlebars/ext",
 
       // 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']
-        });
+        viewClass = handlebarsGetView(data.view, viewClass, container, data);
       }
 
       
       return viewClass;
     }
 
-    /**
-      This method uses `Ember.Handlebars.get` to lookup a value, then ensures
-      that the value is escaped properly.
-
-      If `unescaped` is a truthy value then the escaping will not be performed.
-
-      @method getEscaped
-      @for Ember.Handlebars
-      @param {Object} root The object to look up the property on
-      @param {String} path The path to be lookedup
-      @param {Object} options The template's option hash
-      @since 1.4.0
-    */
-    function getEscaped(root, path, options) {
-      var result = handlebarsGet(root, path, options);
-
-      if (result === null || result === undefined) {
-        result = "";
-      } else if (!(result instanceof Handlebars.SafeString)) {
-        result = String(result);
-      }
-      if (!options.hash.unescaped){
-        result = Handlebars.Utils.escapeExpression(result);
+    function stringifyValue(value, shouldEscape) {
+      if (value === null || value === undefined) {
+        value = "";
+      } else if (!(value instanceof Handlebars.SafeString)) {
+        value = String(value);
       }
 
-      return result;
+      if (shouldEscape) {
+        value = Handlebars.Utils.escapeExpression(value);
+      }
+
+      return value;
     }
 
-    __exports__.getEscaped = getEscaped;function resolveParams(context, params, options) {
-      var resolvedParams = [], types = options.types, param, type;
-
-      for (var i=0, l=params.length; i<l; i++) {
-        param = params[i];
-        type = types[i];
-
-        if (type === 'ID') {
-          resolvedParams.push(handlebarsGet(context, param, options));
-        } else {
-          resolvedParams.push(param);
-        }
-      }
-
-      return resolvedParams;
-    }
-
-    __exports__.resolveParams = resolveParams;function resolveHash(context, hash, options) {
-      var resolvedHash = {}, types = options.hashTypes, type;
-
-      for (var key in hash) {
-        if (!hash.hasOwnProperty(key)) { continue; }
-
-        type = types[key];
-
-        if (type === 'ID') {
-          resolvedHash[key] = handlebarsGet(context, hash[key], options);
-        } else {
-          resolvedHash[key] = hash[key];
-        }
-      }
-
-      return resolvedHash;
-    }
-
-    __exports__.resolveHash = resolveHash;/**
+    __exports__.stringifyValue = stringifyValue;/**
       Registers a helper in Handlebars that will be called if no property with the
       given name can be found on the current context object, and no helper with
       that name is registered.
@@ -6759,52 +6621,42 @@ enifed("ember-handlebars/ext",
       @param {Hash} options
     */
     function helperMissingHelper(path) {
-      if (!resolveHelper) { resolveHelper = requireModule('ember-handlebars/helpers/binding')['resolveHelper']; } // ES6TODO: stupid circular dep
+      if (!resolveHelper) {
+        resolveHelper = requireModule('ember-handlebars/helpers/binding')['resolveHelper'];
+      } // ES6TODO: stupid circular dep
 
-      var error, view = "";
+      var error, fmtError, view = "";
 
       var options = arguments[arguments.length - 1];
 
-      var helper = resolveHelper(options.data.view.container, path);
+      var helper = resolveHelper(options.data.view.container, options.name);
 
       if (helper) {
-        return helper.apply(this, slice.call(arguments, 1));
+        return helper.apply(this, arguments);
       }
 
-      error = "%@ Handlebars error: Could not find property '%@' on object %@.";
       if (options.data) {
         view = options.data.view;
       }
-      throw new EmberError(fmt(error, [view, path, this]));
+
+      if (options.name.match(/-/)) {
+        error = "%@ Handlebars error: Could not find component or helper named '%@'";
+        fmtError = fmt(error, [view, options.name]);
+      } else {
+        error = "%@ Handlebars error: Could not find property '%@' on object %@.";
+        fmtError = fmt(error, [view, options.name, this]);
+      }
+
+      throw new EmberError(fmtError);
     }
 
     __exports__.helperMissingHelper = helperMissingHelper;/**
-      Registers a helper in Handlebars that will be called if no property with the
-      given name can be found on the current context object, and no helper with
-      that name is registered.
-
-      This throws an exception with a more helpful error message so the user can
-      track down where the problem is happening.
-
       @private
-      @method helperMissing
+      @method blockHelperMissingHelper
       @for Ember.Handlebars.helpers
-      @param {String} path
-      @param {Hash} options
     */
-    function blockHelperMissingHelper(path) {
-      if (!resolveHelper) { resolveHelper = requireModule('ember-handlebars/helpers/binding')['resolveHelper']; } // ES6TODO: stupid circular dep
-
-      var options = arguments[arguments.length - 1];
-
-      
-      var helper = resolveHelper(options.data.view.container, path);
-
-      if (helper) {
-        return helper.apply(this, slice.call(arguments, 1));
-      } else {
-        return helpers.helperMissing.call(this, path);
-      }
+    function blockHelperMissingHelper() {
+      return;
     }
 
     __exports__.blockHelperMissingHelper = blockHelperMissingHelper;/**
@@ -6948,190 +6800,111 @@ enifed("ember-handlebars/ext",
       @since 1.2.0
     */
     function makeBoundHelper(fn) {
-      if (!SimpleHandlebarsView) { SimpleHandlebarsView = requireModule('ember-handlebars/views/handlebars_bound_view')['SimpleHandlebarsView']; } // ES6TODO: stupid circular dep
+      if (!SimpleHandlebarsView) {
+        SimpleHandlebarsView = requireModule('ember-handlebars/views/handlebars_bound_view')['SimpleHandlebarsView'];
+      } // ES6TODO: stupid circular dep
 
-      var dependentKeys = slice.call(arguments, 1);
+      var dependentKeys = [];
+      for (var i = 1; i < arguments.length; i++) {
+        dependentKeys.push(arguments[i]);
+      }
 
       function helper() {
-        var properties = slice.call(arguments, 0, -1);
-        var numProperties = properties.length;
-        var options = arguments[arguments.length - 1];
-        var normalizedProperties = [];
+        var numParams = arguments.length - 1;
+        var options = arguments[numParams];
         var data = options.data;
-        var types = data.isUnbound ? slice.call(options.types, 1) : options.types;
+        var view = data.view;
+        var types = options.types;
         var hash = options.hash;
         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;
+        var context = this;
 
         
-        // Detect bound options (e.g. countBinding="otherCount")
-        var boundOptions = hash.boundOptions = {};
-        for (hashOption in hash) {
-          if (IS_BINDING.test(hashOption)) {
-            // Lop off 'Binding' suffix.
-            boundOptions[hashOption.slice(0, -7)] = hash[hashOption];
-          } else if (hashTypes[hashOption] === 'ID') {
-            boundOptions[hashOption] = hash[hashOption];
-          }
-        }
+        var properties = new Array(numParams);
+        var params = new Array(numParams);
 
-        // Expose property names on data.properties object.
-        var watchedProperties = [];
-        data.properties = [];
-        for (loc = 0; loc < numProperties; ++loc) {
-          data.properties.push(properties[loc]);
-          if (types[loc] === 'ID') {
-            var normalizedProp = normalizePath(currentContext, properties[loc], data);
-            normalizedProperties.push(normalizedProp);
-            watchedProperties.push(normalizedProp);
+        for (var i = 0; i < numParams; i++) {
+          properties[i] = arguments[i];
+          if (types[i] === 'ID') {
+            params[i] = view.getStream(arguments[i]);
           } else {
-            if (data.isUnbound) {
-              normalizedProperties.push({path: properties[loc]});
-            }else {
-              normalizedProperties.push(null);
-            }
+            params[i] = arguments[i];
           }
         }
 
-        // Handle case when helper invocation is preceded by `unbound`, e.g.
-        // {{unbound myHelper foo}}
-        if (data.isUnbound) {
-          return evaluateUnboundHelper(this, fn, normalizedProperties, options);
+        for (var prop in hash) {
+          if (IS_BINDING.test(prop)) {
+            hash[prop.slice(0, -7)] = view.getStream(hash[prop]);
+            hash[prop] = undefined;
+          } else if (hashTypes[prop] === 'ID') {
+            hash[prop] = view.getStream(hash[prop]);
+          }
         }
 
-        var bindView = new SimpleHandlebarsView(null, null, !options.hash.unescaped, options.data);
-
-        // Override SimpleHandlebarsView's method for generating the view's content.
-        bindView.normalizedValue = function() {
-          var args = [];
-          var boundOption;
-
-          // Copy over bound hash options.
-          for (boundOption in boundOptions) {
-            if (!boundOptions.hasOwnProperty(boundOption)) { continue; }
-            property = normalizePath(currentContext, boundOptions[boundOption], data);
-            bindView.path = property.path;
-            bindView.pathRoot = property.root;
-            hash[boundOption] = normalizedValue.call(bindView);
-          }
-
-          for (loc = 0; loc < numProperties; ++loc) {
-            property = normalizedProperties[loc];
-            if (property) {
-              bindView.path = property.path;
-              bindView.pathRoot = property.root;
-              args.push(normalizedValue.call(bindView));
-            } else {
-              args.push(properties[loc]);
-            }
-          }
-          args.push(options);
-
-          // Run the supplied helper function.
-          return fn.apply(currentContext, args);
+        var valueFn = function() {
+          var args = readArray(params);
+          args.push({
+            hash: readHash(hash),
+            data: { properties: properties }
+          });
+          return fn.apply(context, args);
         };
 
-        view.appendChild(bindView);
+        if (data.isUnbound) {
+          return valueFn();
+        } else {
+          var lazyValue = new Stream(valueFn);
+          var bindView = new SimpleHandlebarsView(lazyValue, !options.hash.unescaped);
+          view.appendChild(bindView);
 
-        // Assemble list of watched properties that'll re-render this helper.
-        for (boundOption in boundOptions) {
-          if (boundOptions.hasOwnProperty(boundOption)) {
-            watchedProperties.push(normalizePath(currentContext, boundOptions[boundOption], data));
+          var scheduledRerender = view._wrapAsScheduled(bindView.rerender);
+          lazyValue.subscribe(scheduledRerender, bindView);
+
+          var param;
+
+          for (i = 0; i < numParams; i++) {
+            param = params[i];
+            if (param && param.isStream) {
+              param.subscribe(lazyValue.notify, lazyValue);
+            }
           }
-        }
 
-        // Observe each property.
-        for (loc = 0, len = watchedProperties.length; loc < len; ++loc) {
-          property = watchedProperties[loc];
-          view.registerObserver(property.root, property.path, bindView, bindView.rerender);
-        }
+          for (prop in hash) {
+            param = hash[prop];
+            if (param && param.isStream) {
+              param.subscribe(lazyValue.notify, lazyValue);
+            }
+          }
 
-        if (types[0] !== 'ID' || normalizedProperties.length === 0) {
-          return;
-        }
-
-        // Add dependent key observers to the first param
-        var normalized = normalizedProperties[0];
-        var pathRoot = normalized.root;
-        var path = normalized.path;
-
-        if(!isEmpty(path)) {
-          prefixPathForDependentKeys = path + '.';
-        }
-        for (var i=0, l=dependentKeys.length; i<l; i++) {
-          view.registerObserver(pathRoot, prefixPathForDependentKeys + dependentKeys[i], bindView, bindView.rerender);
+          if (numParams > 0) {
+            var firstParam = params[0];
+            // Only bother with subscriptions if the first argument
+            // is a stream itself, and not a primitive.
+            if (firstParam && firstParam.isStream) {
+              var onDependentKeyNotify = function onDependentKeyNotify(stream) {
+                stream.value();
+                lazyValue.notify();
+              };
+              for (i = 0; i < dependentKeys.length; i++) {
+                var childParam = firstParam.get(dependentKeys[i]);
+                childParam.value();
+                childParam.subscribe(onDependentKeyNotify);
+              }
+            }
+          }
         }
       }
 
-      helper._rawFunction = fn;
       return helper;
     }
 
-    /**
-      Renders the unbound form of an otherwise bound helper function.
-
-      @private
-      @method evaluateUnboundHelper
-      @param {Function} fn
-      @param {Object} context
-      @param {Array} normalizedProperties
-      @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;
-
-      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) {
-        property = normalizedProperties[loc];
-        propertyType = types[loc];
-        if (propertyType === "ID") {
-          args.push(handlebarsGet(property.root, property.path, options));
-        } else {
-          args.push(property.path);
-        }
-      }
-      args.push(options);
-      return fn.apply(context, args);
-    }
-
-    /**
-      Overrides Handlebars.template so that we can distinguish
-      user-created, top-level templates from inner contexts.
-
-      @private
-      @method template
-      @for Ember.Handlebars
-      @param {String} spec
-    */
-    function template(spec) {
-      var t = originalTemplate(spec);
-      t.isTop = true;
-      return t;
-    }
-
-    __exports__.template = template;__exports__.normalizePath = normalizePath;
     __exports__.makeBoundHelper = makeBoundHelper;
-    __exports__.handlebarsGet = handlebarsGet;
     __exports__.handlebarsGetView = handlebarsGetView;
-    __exports__.evaluateUnboundHelper = evaluateUnboundHelper;
+    __exports__.handlebarsGet = handlebarsGet;
   });
-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__) {
+enifed("ember-handlebars/helpers/bind_attr",
+  ["ember-metal/core","ember-handlebars-compiler","ember-metal/utils","ember-runtime/system/string","ember-metal/array","ember-views/views/view","ember-metal/keys","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -7139,586 +6912,19 @@ enifed("ember-handlebars/helpers/binding",
     */
 
     var Ember = __dependency1__["default"];
-    // Ember.assert, Ember.warn, uuid
-    // var emberAssert = Ember.assert, Ember.warn = Ember.warn;
-
+    // Ember.assert
     var EmberHandlebars = __dependency2__["default"];
-    var get = __dependency3__.get;
-    var set = __dependency4__.set;
-    var apply = __dependency5__.apply;
-    var uuid = __dependency5__.uuid;
-    var fmt = __dependency6__.fmt;
-    var o_create = __dependency7__.create;
-    var isNone = __dependency8__["default"];
-    var EnumerableUtils = __dependency9__["default"];
-    var forEach = __dependency10__.forEach;
-    var View = __dependency11__["default"];
-    var run = __dependency12__["default"];
-    var removeObserver = __dependency13__.removeObserver;
-    var isGlobalPath = __dependency14__.isGlobalPath;
-    var emberBind = __dependency14__.bind;
-    var jQuery = __dependency15__["default"];
-    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 normalizePath = __dependency16__.normalizePath;
-    var handlebarsGet = __dependency16__.handlebarsGet;
-    var getEscaped = __dependency16__.getEscaped;
-
-    var guidFor = __dependency5__.guidFor;
-    var typeOf = __dependency5__.typeOf;
+    var uuid = __dependency3__.uuid;
+    var fmt = __dependency4__.fmt;
+    var typeOf = __dependency3__.typeOf;
+    var forEach = __dependency5__.forEach;
+    var View = __dependency6__["default"];
+    var keys = __dependency7__["default"];
 
     var helpers = EmberHandlebars.helpers;
     var SafeString = EmberHandlebars.SafeString;
 
-    function exists(value) {
-      return !isNone(value);
-    }
-
-    var WithView = _HandlebarsBoundView.extend({
-      init: function() {
-        var controller;
-
-        apply(this, this._super, arguments);
-
-        var keywords        = this.templateData.keywords;
-        var keywordName     = this.templateHash.keywordName;
-        var keywordPath     = this.templateHash.keywordPath;
-        var controllerName  = this.templateHash.controller;
-        var preserveContext = this.preserveContext;
-
-        if (controllerName) {
-          var previousContext = this.previousContext;
-          controller = this.container.lookupFactory('controller:'+controllerName).create({
-            parentController: previousContext,
-            target: previousContext
-          });
-
-          this._generatedController = controller;
-
-          if (!preserveContext) {
-            this.set('controller', controller);
-
-            this.valueNormalizerFunc = function(result) {
-                controller.set('model', result);
-                return controller;
-            };
-          } else {
-            var controllerPath = jQuery.expando + guidFor(controller);
-            keywords[controllerPath] = controller;
-            emberBind(keywords, controllerPath + '.model', keywordPath);
-            keywordPath = controllerPath;
-          }
-        }
-
-        if (preserveContext) {
-          emberBind(keywords, keywordName, keywordPath);
-        }
-
-      },
-      willDestroy: function() {
-        this._super();
-
-        if (this._generatedController) {
-          this._generatedController.destroy();
-        }
-      }
-    });
-
-    // 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;
-
-      // we relied on the behavior of calling without
-      // context to mean this === window, but when running
-      // "use strict", it's possible for this to === undefined;
-      var currentContext = this || window;
-
-      normalized = normalizePath(currentContext, property, data);
-
-      if (data.insideGroup) {
-        observer = function() {
-          while (view._contextView) {
-            view = view._contextView;
-          }
-          run.once(view, 'rerender');
-        };
-
-        var template, context;
-        var result = handlebarsGet(currentContext, property, options);
-
-        result = valueNormalizer ? valueNormalizer(result) : result;
-
-        context = preserveContext ? currentContext : result;
-        if (shouldDisplay(result)) {
-          template = fn;
-        } else if (inverse) {
-          template = inverse;
-        }
-
-        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
-        };
-
-        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);
-          }
-        }
-      }
-    }
-
-    function simpleBind(currentContext, property, options) {
-      var data = options.data;
-      var view = data.view;
-      var normalized, observer, pathRoot, output;
-
-      normalized = normalizePath(currentContext, property, data);
-      pathRoot = normalized.root;
-
-      // Set up observers for observable objects
-      if (pathRoot && ('object' === typeof pathRoot)) {
-        if (data.insideGroup) {
-          observer = function() {
-            while (view._contextView) {
-              view = view._contextView;
-            }
-            run.once(view, 'rerender');
-          };
-
-          output = handlebarsGetEscaped(currentContext, property, options);
-
-          data.buffer.push(output);
-        } else {
-          var bindView = new SimpleHandlebarsView(
-            property, currentContext, !options.hash.unescaped, options.data
-          );
-
-          bindView._parentView = view;
-          view.appendChild(bindView);
-
-          observer = function() {
-            run.scheduleOnce('render', bindView, 'rerender');
-          };
-        }
-
-        // 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);
-        }
-      } else {
-        // The object is not observable, so just render it out and
-        // be done with it.
-        output = handlebarsGetEscaped(currentContext, property, options);
-        data.buffer.push(output);
-      }
-    }
-
-    function shouldDisplayIfHelperContent(result) {
-      var truthy = result && get(result, 'isTruthy');
-      if (typeof truthy === 'boolean') { return truthy; }
-
-      if (isArray(result)) {
-        return get(result, 'length') !== 0;
-      } else {
-        return !!result;
-      }
-    }
-
-    /**
-      '_triageMustache' is used internally select between a binding, helper, or component for
-      the given context. Until this point, it would be hard to determine if the
-      mustache is a property reference or a regular helper reference. This triage
-      helper resolves that.
-
-      This would not be typically invoked by directly.
-
-      @private
-      @method _triageMustache
-      @for Ember.Handlebars.helpers
-      @param {String} property Property/helperID to triage
-      @param {Object} options hash of template/rendering options
-      @return {String} HTML string
-    */
-    function _triageMustacheHelper(property, options) {
-      
-      var helper = EmberHandlebars.resolveHelper(options.data.view.container, property);
-      if (helper) {
-        return helper.call(this, options);
-      }
-
-      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:
-
-      * Look for a registered helper
-      * If a dash exists in the name:
-        * Look for a helper registed in the container
-        * Use Ember.ComponentLookup to find an Ember.Component that resolves
-          to the given name
-
-      @private
-      @method resolveHelper
-      @param {Container} container
-      @param {String} name the name of the helper to lookup
-      @return {Handlebars Helper}
-    */
-    function resolveHelper(container, name) {
-      if (helpers[name]) {
-        return helpers[name];
-      }
-
-      if (!container || ISNT_HELPER_CACHE.get(name)) {
-        return;
-      }
-
-      var helper = container.lookup('helper:' + name);
-      if (!helper) {
-        var componentLookup = container.lookup('component-lookup:main');
-        
-        var Component = componentLookup.lookupFactory(name, container);
-        if (Component) {
-          helper = EmberHandlebars.makeViewHelper(Component);
-          container.register('helper:' + name, helper);
-        }
-      }
-      return helper;
-    }
-
-
-    /**
-      `bind` can be used to display a value, then update that value if it
-      changes. For example, if you wanted to print the `title` property of
-      `content`:
-
-      ```handlebars
-      {{bind "content.title"}}
-      ```
-
-      This will return the `title` property as a string, then create a new observer
-      at the specified path. If it changes, it will update the value in DOM. Note
-      that if you need to support IE7 and IE8 you must modify the model objects
-      properties using `Ember.get()` and `Ember.set()` for this to work as it
-      relies on Ember's KVO system. For all other browsers this will be handled for
-      you automatically.
-
-      @private
-      @method bind
-      @for Ember.Handlebars.helpers
-      @param {String} property Property to bind
-      @param {Function} fn Context to provide for rendering
-      @return {String} HTML string
-    */
-    function bindHelper(property, options) {
-      
-      var context = (options.contexts && options.contexts.length) ? options.contexts[0] : this;
-
-      if (!options.fn) {
-        return simpleBind(context, property, options);
-      }
-
-      options.helperName = 'bind';
-
-      return bind.call(context, property, options, false, exists);
-    }
-
-    /**
-      Use the `boundIf` helper to create a conditional that re-evaluates
-      whenever the truthiness of the bound value changes.
-
-      ```handlebars
-      {{#boundIf "content.shouldDisplayTitle"}}
-        {{content.title}}
-      {{/boundIf}}
-      ```
-
-      @private
-      @method boundIf
-      @for Ember.Handlebars.helpers
-      @param {String} property Property to bind
-      @param {Function} fn Context to provide for rendering
-      @return {String} HTML string
-    */
-    function boundIfHelper(property, fn) {
-      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this;
-
-      fn.helperName = fn.helperName || 'boundIf';
-
-      return bind.call(context, property, fn, true, shouldDisplayIfHelperContent, shouldDisplayIfHelperContent, ['isTruthy', 'length']);
-    }
-
-    /**
-      @private
-
-      Use the `unboundIf` helper to create a conditional that evaluates once.
-
-      ```handlebars
-      {{#unboundIf "content.shouldDisplayTitle"}}
-        {{content.title}}
-      {{/unboundIf}}
-      ```
-
-      @method unboundIf
-      @for Ember.Handlebars.helpers
-      @param {String} property Property to bind
-      @param {Function} fn Context to provide for rendering
-      @return {String} HTML string
-      @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;
-
-      normalized = normalizePath(context, property, data);
-      propertyValue = handlebarsGet(context, property, fn);
-
-      if (!shouldDisplayIfHelperContent(propertyValue)) {
-        template = inverse;
-      }
-
-      template(context, { data: data });
-    }
-
-    /**
-      Use the `{{with}}` helper when you want to scope context. Take the following code as an example:
-
-      ```handlebars
-      <h5>{{user.name}}</h5>
-
-      <div class="role">
-        <h6>{{user.role.label}}</h6>
-        <span class="role-id">{{user.role.id}}</span>
-
-        <p class="role-desc">{{user.role.description}}</p>
-      </div>
-      ```
-
-      `{{with}}` can be our best friend in these cases,
-      instead of writing `user.role.*` over and over, we use `{{#with user.role}}`.
-      Now the context within the `{{#with}} .. {{/with}}` block is `user.role` so you can do the following:
-
-      ```handlebars
-      <h5>{{user.name}}</h5>
-
-      <div class="role">
-        {{#with user.role}}
-          <h6>{{label}}</h6>
-          <span class="role-id">{{id}}</span>
-
-          <p class="role-desc">{{description}}</p>
-        {{/with}}
-      </div>
-      ```
-
-      ### `as` operator
-
-      This operator aliases the scope to a new name. It's helpful for semantic clarity and to retain
-      default scope or to reference from another `{{with}}` block.
-
-      ```handlebars
-      // posts might not be
-      {{#with user.posts as blogPosts}}
-        <div class="notice">
-          There are {{blogPosts.length}} blog posts written by {{user.name}}.
-        </div>
-
-        {{#each post in blogPosts}}
-          <li>{{post.title}}</li>
-        {{/each}}
-      {{/with}}
-      ```
-
-      Without the `as` operator, it would be impossible to reference `user.name` in the example above.
-
-      NOTE: The alias should not reuse a name from the bound property path.
-      For example: `{{#with foo.bar as foo}}` is not supported because it attempts to alias using
-      the first part of the property path, `foo`. Instead, use `{{#with foo.bar as baz}}`.
-
-      ### `controller` option
-
-      Adding `controller='something'` instructs the `{{with}}` helper to create and use an instance of
-      the specified controller with the new context as its content.
-
-      This is very similar to using an `itemController` option with the `{{each}}` helper.
-
-      ```handlebars
-      {{#with users.posts controller='userBlogPosts'}}
-        {{!- The current context is wrapped in our controller instance }}
-      {{/with}}
-      ```
-
-      In the above example, the template provided to the `{{with}}` block is now wrapped in the
-      `userBlogPost` controller, which provides a very elegant way to decorate the context with custom
-      functions/properties.
-
-      @method with
-      @for Ember.Handlebars.helpers
-      @param {Function} context
-      @param {Hash} options
-      @return {String} HTML string
-    */
-    function withHelper(context, options) {
-      var bindContext, preserveContext, controller;
-      var helperName = 'with';
-
-      if (arguments.length === 4) {
-        var keywordName, path, rootPath, normalized, contextPath;
-
-                options = arguments[3];
-        keywordName = arguments[2];
-        path = arguments[0];
-
-        if (path) {
-          helperName += ' ' + path + ' as ' + keywordName;
-        }
-
-        
-        var localizedOptions = o_create(options);
-        localizedOptions.data = o_create(options.data);
-        localizedOptions.data.keywords = o_create(options.data.keywords || {});
-
-        if (isGlobalPath(path)) {
-          contextPath = path;
-        } else {
-          normalized = normalizePath(this, path, options.data);
-          path = normalized.path;
-          rootPath = normalized.root;
-
-          // This is a workaround for the fact that you cannot bind separate objects
-          // together. When we implement that functionality, we should use it here.
-          var contextKey = jQuery.expando + guidFor(rootPath);
-          localizedOptions.data.keywords[contextKey] = rootPath;
-          // if the path is '' ("this"), just bind directly to the current context
-          contextPath = path ? contextKey + '.' + path : contextKey;
-        }
-
-        localizedOptions.hash.keywordName = keywordName;
-        localizedOptions.hash.keywordPath = contextPath;
-
-        bindContext = this;
-        context = contextPath;
-        options = localizedOptions;
-        preserveContext = true;
-      } else {
-                
-        helperName += ' ' + context;
-        bindContext = options.contexts[0];
-        preserveContext = false;
-      }
-
-      options.helperName = helperName;
-      options.isWithHelper = true;
-
-      return bind.call(bindContext, context, options, preserveContext, exists);
-    }
-    /**
-      See [boundIf](/api/classes/Ember.Handlebars.helpers.html#method_boundIf)
-      and [unboundIf](/api/classes/Ember.Handlebars.helpers.html#method_unboundIf)
-
-      @method if
-      @for Ember.Handlebars.helpers
-      @param {Function} context
-      @param {Hash} options
-      @return {String} HTML string
-    */
-    function ifHelper(context, options) {
-            
-      options.helperName = options.helperName || ('if ' + context);
-
-      if (options.data.isUnbound) {
-        return helpers.unboundIf.call(options.contexts[0], context, options);
-      } else {
-        return helpers.boundIf.call(options.contexts[0], context, options);
-      }
-    }
-
-    /**
-      @method unless
-      @for Ember.Handlebars.helpers
-      @param {Function} context
-      @param {Hash} options
-      @return {String} HTML string
-    */
-    function unlessHelper(context, options) {
-            
-      var fn = options.fn;
-      var inverse = options.inverse;
-      var helperName = 'unless';
-
-      if (context) {
-        helperName += ' ' + context;
-      }
-
-      options.fn = inverse;
-      options.inverse = fn;
-
-      options.helperName = options.helperName || helperName;
-
-      if (options.data.isUnbound) {
-        return helpers.unboundIf.call(options.contexts[0], context, options);
-      } else {
-        return helpers.boundIf.call(options.contexts[0], context, options);
-      }
-    }
-
     /**
       `bind-attr` allows you to create a binding between DOM element attributes and
       Ember objects. For example:
@@ -7874,43 +7080,22 @@ enifed("ember-handlebars/helpers/binding",
       // current value of the property as an attribute.
       forEach.call(attrKeys, function(attr) {
         var path = attrs[attr];
-        var normalized;
 
         
-        normalized = normalizePath(ctx, path, options.data);
-
-        var value = (path === 'this') ? normalized.root : handlebarsGet(ctx, path, options);
+        var lazyValue = view.getStream(path);
+        var value = lazyValue.value();
         var type = typeOf(value);
 
         
-        var observer;
-
-        observer = function observer() {
-          var result = handlebarsGet(ctx, path, options);
+        lazyValue.subscribe(view._wrapAsScheduled(function applyAttributeBindings() {
+          var result = lazyValue.value();
 
           
           var elem = view.$("[data-bindattr-" + dataId + "='" + dataId + "']");
 
-          // If we aren't able to find the element, it means the element
-          // to which we were bound has been removed from the view.
-          // In that case, we can assume the template has been re-rendered
-          // and we need to clean up the observer.
-          if (!elem || elem.length === 0) {
-            removeObserver(normalized.root, normalized.path, observer);
-            return;
-          }
-
+          
           View.applyAttributeBindings(elem, attr, result);
-        };
-
-        // Add an observer to the view for when the property changes.
-        // When the observer fires, find the element using the
-        // unique data id and update the attribute to the new value.
-        // Note: don't add observer when path is 'this' or path
-        // is whole keyword e.g. {{#each x in list}} ... {{bind-attr attr="x"}}
-        if (path !== 'this' && !(normalized.isKeyword && normalized.path === '' )) {
-          view.registerObserver(normalized.root, normalized.path, observer);
-        }
+        }));
 
         // if this changes, also change the logic in ember-views/lib/views/view.js
         if ((type === 'string' || (type === 'number' && !isNaN(value)))) {
@@ -7938,7 +7123,8 @@ enifed("ember-handlebars/helpers/binding",
       @return {String} HTML string
     */
     function bindAttrHelperDeprecated() {
-            return helpers['bind-attr'].apply(this, arguments);
+      
+      return helpers['bind-attr'].apply(this, arguments);
     }
 
     /**
@@ -7968,24 +7154,6 @@ enifed("ember-handlebars/helpers/binding",
       var ret = [];
       var 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;
-
-        if (path === 'this') {
-          val = root;
-        } else if (path === '') {
-          val = true;
-        } else {
-          val = handlebarsGet(root, path, options);
-        }
-
-        return View._classStringForValue(path, val, parsedPath.className, parsedPath.falsyClassName);
-      };
-
       // For each property passed, loop through and setup
       // an observer.
       forEach.call(classBindings.split(' '), function(binding) {
@@ -7994,31 +7162,25 @@ 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 initialValue;
 
-        if (path !== '' && path !== 'this') {
-          normalized = normalizePath(context, path, options.data);
+        if (path === '') {
+          initialValue = true;
+        } else {
+          var lazyValue = view.getStream(path);
+          initialValue = lazyValue.value();
 
-          pathRoot = normalized.root;
-          path = normalized.path;
-        }
+          // Set up an observer on the context. If the property changes, toggle the
+          // class name.
+          lazyValue.subscribe(view._wrapAsScheduled(function applyClassNameBindings() {
+            // Get the current value of the property
+            var value = lazyValue.value();
+            newClass = classStringForParsedPath(parsedPath, value);
+            elem = bindAttrId ? view.$("[data-bindattr-" + bindAttrId + "='" + bindAttrId + "']") : view.$();
 
-        // Set up an observer on the context. If the property changes, toggle the
-        // class name.
-        observer = function() {
-          // Get the current value of the property
-          newClass = classStringForPath(context, parsedPath, options);
-          elem = bindAttrId ? view.$("[data-bindattr-" + bindAttrId + "='" + bindAttrId + "']") : view.$();
-
-          // If we can't find the element anymore, a parent template has been
-          // re-rendered and we've been nuked. Remove the observer.
-          if (!elem || elem.length === 0) {
-            removeObserver(pathRoot, path, observer);
-          } else {
+            
             // If we had previously added a class to the element, remove it.
             if (oldClass) {
               elem.removeClass(oldClass);
@@ -8032,16 +7194,12 @@ enifed("ember-handlebars/helpers/binding",
             } else {
               oldClass = null;
             }
-          }
-        };
-
-        if (path !== '' && path !== 'this') {
-          view.registerObserver(pathRoot, path, observer);
+          }));
         }
 
         // We've already setup the observer; now we just need to figure out the
         // correct behavior right now on the first pass through.
-        value = classStringForPath(context, parsedPath, options);
+        value = classStringForParsedPath(parsedPath, initialValue);
 
         if (value) {
           ret.push(value);
@@ -8055,22 +7213,234 @@ enifed("ember-handlebars/helpers/binding",
       return ret;
     }
 
-    __exports__.bind = bind;
-    __exports__._triageMustacheHelper = _triageMustacheHelper;
-    __exports__.resolveHelper = resolveHelper;
-    __exports__.bindHelper = bindHelper;
-    __exports__.boundIfHelper = boundIfHelper;
-    __exports__.unboundIfHelper = unboundIfHelper;
-    __exports__.withHelper = withHelper;
-    __exports__.ifHelper = ifHelper;
-    __exports__.unlessHelper = unlessHelper;
+    function classStringForParsedPath(parsedPath, value) {
+      return View._classStringForValue(parsedPath.path, value, parsedPath.className, parsedPath.falsyClassName);
+    }
+
+    __exports__["default"] = bindAttrHelper;
+
     __exports__.bindAttrHelper = bindAttrHelper;
     __exports__.bindAttrHelperDeprecated = bindAttrHelperDeprecated;
     __exports__.bindClasses = bindClasses;
   });
+enifed("ember-handlebars/helpers/binding",
+  ["ember-metal/core","ember-handlebars-compiler","ember-metal/is_none","ember-metal/run_loop","ember-metal/cache","ember-metal/streams/simple","ember-handlebars/views/handlebars_bound_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var EmberHandlebars = __dependency2__["default"];
+
+    var isNone = __dependency3__["default"];
+    var run = __dependency4__["default"];
+    var Cache = __dependency5__["default"];
+    var SimpleStream = __dependency6__["default"];
+
+    var _HandlebarsBoundView = __dependency7__._HandlebarsBoundView;
+    var SimpleHandlebarsView = __dependency7__.SimpleHandlebarsView;
+
+    var helpers = EmberHandlebars.helpers;
+
+    function exists(value) {
+      return !isNone(value);
+    }
+
+    // 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, _viewClass) {
+      var data = options.data;
+      var view = data.view;
+
+      // we relied on the behavior of calling without
+      // context to mean this === window, but when running
+      // "use strict", it's possible for this to === undefined;
+      var currentContext = this || window;
+
+      var valueStream = view.getStream(property);
+      var lazyValue;
+
+      if (childProperties) {
+        lazyValue = new SimpleStream(valueStream);
+
+        var subscriber = function(childStream) {
+          childStream.value();
+          lazyValue.notify();
+        };
+
+        for (var i = 0; i < childProperties.length; i++) {
+          var childStream = valueStream.get(childProperties[i]);
+          childStream.value();
+          childStream.subscribe(subscriber);
+        }
+      } else {
+        lazyValue = valueStream;
+      }
+
+      // Set up observers for observable objects
+      var viewClass = _viewClass || _HandlebarsBoundView;
+      var viewOptions = {
+        preserveContext: preserveContext,
+        shouldDisplayFunc: shouldDisplay,
+        valueNormalizerFunc: valueNormalizer,
+        displayTemplate: options.fn,
+        inverseTemplate: options.inverse,
+        lazyValue: lazyValue,
+        previousContext: currentContext,
+        isEscaped: !options.hash.unescaped,
+        templateData: options.data,
+        templateHash: options.hash,
+        helperName: options.helperName
+      };
+
+      if (options.keywords) {
+        viewOptions._keywords = options.keywords;
+      }
+
+      // 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);
+
+      lazyValue.subscribe(view._wrapAsScheduled(function() {
+        run.scheduleOnce('render', bindView, 'rerenderIfNeeded');
+      }));
+    }
+
+    function simpleBind(currentContext, lazyValue, options) {
+      var data = options.data;
+      var view = data.view;
+
+      var bindView = new SimpleHandlebarsView(
+        lazyValue, !options.hash.unescaped
+      );
+
+      bindView._parentView = view;
+      view.appendChild(bindView);
+
+      lazyValue.subscribe(view._wrapAsScheduled(function() {
+        run.scheduleOnce('render', bindView, 'rerender');
+      }));
+    }
+
+    /**
+      '_triageMustache' is used internally select between a binding, helper, or component for
+      the given context. Until this point, it would be hard to determine if the
+      mustache is a property reference or a regular helper reference. This triage
+      helper resolves that.
+
+      This would not be typically invoked by directly.
+
+      @private
+      @method _triageMustache
+      @for Ember.Handlebars.helpers
+      @param {String} property Property/helperID to triage
+      @param {Object} options hash of template/rendering options
+      @return {String} HTML string
+    */
+    function _triageMustacheHelper(property, options) {
+      
+      var helper = EmberHandlebars.resolveHelper(options.data.view.container, property);
+      if (helper) {
+        return helper.call(this, options);
+      }
+
+      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:
+
+      * Look for a registered helper
+      * If a dash exists in the name:
+        * Look for a helper registed in the container
+        * Use Ember.ComponentLookup to find an Ember.Component that resolves
+          to the given name
+
+      @private
+      @method resolveHelper
+      @param {Container} container
+      @param {String} name the name of the helper to lookup
+      @return {Handlebars Helper}
+    */
+    function resolveHelper(container, name) {
+      if (helpers[name]) {
+        return helpers[name];
+      }
+
+      if (!container || ISNT_HELPER_CACHE.get(name)) {
+        return;
+      }
+
+      var helper = container.lookup('helper:' + name);
+      if (!helper) {
+        var componentLookup = container.lookup('component-lookup:main');
+        
+        var Component = componentLookup.lookupFactory(name, container);
+        if (Component) {
+          helper = EmberHandlebars.makeViewHelper(Component);
+          container.register('helper:' + name, helper);
+        }
+      }
+      return helper;
+    }
+
+
+    /**
+      `bind` can be used to display a value, then update that value if it
+      changes. For example, if you wanted to print the `title` property of
+      `content`:
+
+      ```handlebars
+      {{bind "content.title"}}
+      ```
+
+      This will return the `title` property as a string, then create a new observer
+      at the specified path. If it changes, it will update the value in DOM. Note
+      that if you need to support IE7 and IE8 you must modify the model objects
+      properties using `Ember.get()` and `Ember.set()` for this to work as it
+      relies on Ember's KVO system. For all other browsers this will be handled for
+      you automatically.
+
+      @private
+      @method bind
+      @for Ember.Handlebars.helpers
+      @param {String} property Property to bind
+      @param {Function} fn Context to provide for rendering
+      @return {String} HTML string
+    */
+    function bindHelper(property, options) {
+      
+      var context = (options.contexts && options.contexts.length) ? options.contexts[0] : this;
+
+      if (!options.fn) {
+        var lazyValue = options.data.view.getStream(property);
+        return simpleBind(context, lazyValue, options);
+      }
+
+      options.helperName = 'bind';
+
+      return bind.call(context, property, options, false, exists);
+    }
+
+    __exports__.bind = bind;
+    __exports__._triageMustacheHelper = _triageMustacheHelper;
+    __exports__.resolveHelper = resolveHelper;
+    __exports__.bindHelper = bindHelper;
+  });
 enifed("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__) {
+  ["ember-metal/core","ember-handlebars-compiler","ember-metal/mixin","ember-runtime/system/string","ember-metal/property_get","ember-metal/streams/simple","ember-handlebars/ext","ember-handlebars/helpers/view","ember-views/views/view","ember-views/views/collection_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -8079,23 +7449,21 @@ enifed("ember-handlebars/helpers/collection",
 
     var Ember = __dependency1__["default"];
     // Ember.assert, Ember.deprecate
-    var inspect = __dependency2__.inspect;
 
     // var emberAssert = Ember.assert;
         // emberDeprecate = Ember.deprecate;
 
-    var EmberHandlebars = __dependency3__["default"];
-    var helpers = EmberHandlebars.helpers;
+    var EmberHandlebars = __dependency2__["default"];
 
+    var IS_BINDING = __dependency3__.IS_BINDING;
     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"];
+    var SimpleStream = __dependency6__["default"];
+    var handlebarsGetView = __dependency7__.handlebarsGetView;
+    var ViewHelper = __dependency8__.ViewHelper;
+    var View = __dependency9__["default"];
+    var CollectionView = __dependency10__["default"];
 
-    var alias = computed.alias;
     /**
       `{{collection}}` is a `Ember.Handlebars` helper for adding instances of
       `Ember.CollectionView` to a template. See [Ember.CollectionView](/api/classes/Ember.CollectionView.html)
@@ -8243,13 +7611,14 @@ enifed("ember-handlebars/helpers/collection",
       // Otherwise, just default to the standard class.
       var collectionClass;
       if (path) {
-        collectionClass = handlebarsGetView(this, path, container, options);
+        collectionClass = handlebarsGetView(this, path, container, options.data);
               }
       else {
         collectionClass = CollectionView;
       }
 
       var hash = options.hash;
+      var hashTypes = options.hashTypes;
       var itemHash = {};
       var match;
 
@@ -8258,28 +7627,44 @@ enifed("ember-handlebars/helpers/collection",
       var itemViewClass;
 
       if (hash.itemView) {
-        itemViewClass = handlebarsGetView(this, hash.itemView, container, options);
+        itemViewClass = hash.itemView;
       } else if (hash.itemViewClass) {
-        itemViewClass = handlebarsGetView(collectionPrototype, hash.itemViewClass, container, options);
+        if (hashTypes.itemViewClass === 'ID') {
+          var itemViewClassStream = view.getStream(hash.itemViewClass);
+                    itemViewClass = itemViewClassStream.value();
+        } else {
+          itemViewClass = hash.itemViewClass;
+        }
       } else {
-        itemViewClass = handlebarsGetView(collectionPrototype, collectionPrototype.itemViewClass, container, options);
+        itemViewClass = collectionPrototype.itemViewClass;
+      }
+
+      if (typeof itemViewClass === 'string') {
+        itemViewClass = container.lookupFactory('view:'+itemViewClass);
       }
 
       
       delete hash.itemViewClass;
       delete hash.itemView;
+      delete hashTypes.itemViewClass;
+      delete hashTypes.itemView;
 
       // Go through options passed to the {{collection}} helper and extract options
       // that configure item views instead of the collection itself.
       for (var prop in hash) {
+        if (prop === 'itemController' || prop === 'itemClassBinding') {
+          continue;
+        }
         if (hash.hasOwnProperty(prop)) {
           match = prop.match(/^item(.)(.*)$/);
+          if (match) {
+            var childProp = match[1].toLowerCase() + match[2];
 
-          if (match && prop !== 'itemController') {
-            // Convert itemShouldFoo -> shouldFoo
-            itemHash[match[1].toLowerCase() + match[2]] = hash[prop];
-            // Delete from hash as this will end up getting passed to the
-            // {{view}} helper method.
+            if (hashTypes[prop] === 'ID' || IS_BINDING.test(prop)) {
+              itemHash[childProp] = view._getBindingForStream(hash[prop]);
+            } else {
+              itemHash[childProp] = hash[prop];
+            }
             delete hash[prop];
           }
         }
@@ -8298,29 +7683,47 @@ enifed("ember-handlebars/helpers/collection",
               tagName: itemHash.tagName
         });
       } else if (hash.emptyViewClass) {
-        emptyViewClass = handlebarsGetView(this, hash.emptyViewClass, container, options);
+        emptyViewClass = handlebarsGetView(this, hash.emptyViewClass, container, options.data);
       }
       if (emptyViewClass) { hash.emptyView = emptyViewClass; }
 
       if (hash.keyword) {
-        itemHash._context = this;
+        itemHash._contextBinding = '_parentView.context';
       } else {
-        itemHash._context = alias('content');
+        itemHash._contextBinding = 'content';
       }
 
       var viewOptions = ViewHelper.propertiesFromHTMLOptions({ data: data, hash: itemHash }, this);
-      hash.itemViewClass = itemViewClass.extend(viewOptions);
+
+      if (hash.itemClassBinding) {
+        var itemClassBindings = hash.itemClassBinding.split(' ');
+
+        for (var i = 0; i < itemClassBindings.length; i++) {
+          var parsedPath = View._parsePropertyPath(itemClassBindings[i]);
+          if (parsedPath.path === '') {
+            parsedPath.stream = new SimpleStream(true);
+          } else {
+            parsedPath.stream = view.getStream(parsedPath.path);
+          }
+          itemClassBindings[i] = parsedPath;
+        }
+
+        viewOptions.classNameBindings = itemClassBindings;
+      }
+
+      hash.itemViewClass = itemViewClass;
+      hash._itemViewProps = viewOptions;
 
       options.helperName = options.helperName || 'collection';
 
-      return helpers.view.call(this, collectionClass, options);
+      return EmberHandlebars.helpers.view.call(this, collectionClass, options);
     }
 
     __exports__["default"] = collectionHelper;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/utils","ember-metal/logger","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     /*jshint debug:true*/
 
@@ -8333,10 +7736,6 @@ enifed("ember-handlebars/helpers/debug",
     var inspect = __dependency2__.inspect;
     var Logger = __dependency3__["default"];
 
-    var get = __dependency4__.get;
-    var normalizePath = __dependency5__.normalizePath;
-    var handlebarsGet = __dependency5__.handlebarsGet;
-
     var a_slice = [].slice;
 
     /**
@@ -8354,22 +7753,14 @@ enifed("ember-handlebars/helpers/debug",
     function logHelper() {
       var params = a_slice.call(arguments, 0, -1);
       var options = arguments[arguments.length - 1];
+      var view = options.data.view;
       var logger = Logger.log;
       var values = [];
-      var 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);
-
-          if (normalized.path === 'this') {
-            values.push(normalized.root);
-          } else {
-            values.push(handlebarsGet(normalized.root, normalized.path, options));
-          }
+        if (options.types[i] === 'ID') {
+          var stream = view.getStream(params[i]);
+          values.push(stream.value());
         } else {
           values.push(params[i]);
         }
@@ -8415,6 +7806,7 @@ enifed("ember-handlebars/helpers/debug",
     function debuggerHelper(options) {
 
       // These are helpful values you can inspect while debugging.
+      /* jshint unused: false */
       var templateContext = this;
       var typeOfTemplateContext = inspect(templateContext);
       
@@ -8425,8 +7817,8 @@ enifed("ember-handlebars/helpers/debug",
     __exports__.debuggerHelper = debuggerHelper;
   });
 enifed("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__) {
+  ["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-metal/observer","ember-handlebars/views/metamorph_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
 
     /**
@@ -8435,10 +7827,8 @@ enifed("ember-handlebars/helpers/each",
     */
     var Ember = __dependency1__["default"];
     // Ember.assert;, Ember.K
-    var K = Ember.K;
 
     var EmberHandlebars = __dependency2__["default"];
-    var helpers = EmberHandlebars.helpers;
 
     var fmt = __dependency3__.fmt;
     var get = __dependency4__.get;
@@ -8448,19 +7838,14 @@ enifed("ember-handlebars/helpers/each",
     var ControllerMixin = __dependency8__["default"];
     var ArrayController = __dependency9__["default"];
     var EmberArray = __dependency10__["default"];
-    var copy = __dependency11__["default"];
-    var run = __dependency12__["default"];
-    var on = __dependency13__.on;
-    var handlebarsGet = __dependency14__.handlebarsGet;
-    var computed = __dependency15__.computed;
 
-    var addObserver = __dependency16__.addObserver;
-    var removeObserver = __dependency16__.removeObserver;
-    var addBeforeObserver = __dependency16__.addBeforeObserver;
-    var removeBeforeObserver = __dependency16__.removeBeforeObserver;
+    var addObserver = __dependency11__.addObserver;
+    var removeObserver = __dependency11__.removeObserver;
+    var addBeforeObserver = __dependency11__.addBeforeObserver;
+    var removeBeforeObserver = __dependency11__.removeBeforeObserver;
 
-    var _Metamorph = __dependency17__._Metamorph;
-    var _MetamorphView = __dependency17__._MetamorphView;
+    var _MetamorphView = __dependency12__["default"];
+    var _Metamorph = __dependency12__._Metamorph;
 
     var EachView = CollectionView.extend(_Metamorph, {
 
@@ -8513,22 +7898,11 @@ enifed("ember-handlebars/helpers/each",
       createChildView: function(view, attrs) {
         view = this._super(view, attrs);
 
-        // At the moment, if a container view subclass wants
-        // to insert keywords, it is responsible for cloning
-        // the keywords hash. This will be fixed momentarily.
-        var keyword = get(this, 'keyword');
         var content = get(view, 'content');
+        var keyword = get(this, 'keyword');
 
         if (keyword) {
-          var data = get(view, 'templateData');
-
-          data = copy(data);
-          data.keywords = view.cloneKeywords();
-          set(view, 'templateData', data);
-
-          // In this case, we do not bind, because the `content` of
-          // a #each item cannot change.
-          data.keywords[keyword] = content;
+          view._keywords[keyword] = content;
         }
 
         // If {{#each}} is looping over an array of controllers,
@@ -8553,133 +7927,17 @@ enifed("ember-handlebars/helpers/each",
       }
     });
 
-    var GroupedEach = EmberHandlebars.GroupedEach = function(context, path, options) {
-      var self = this;
-      var normalized = EmberHandlebars.normalizePath(context, path, options.data);
-
-      this.context = context;
-      this.path = path;
-      this.options = options;
-      this.template = options.fn;
-      this.containingView = options.data.view;
-      this.normalizedRoot = normalized.root;
-      this.normalizedPath = normalized.path;
-      this.content = this.lookupContent();
-
-      this.addContentObservers();
-      this.addArrayObservers();
-
-      this.containingView.on('willClearRender', function() {
-        self.destroy();
-      });
-    };
-
-    GroupedEach.prototype = {
-      contentWillChange: function() {
-        this.removeArrayObservers();
-      },
-
-      contentDidChange: function() {
-        this.content = this.lookupContent();
-        this.addArrayObservers();
-        this.rerenderContainingView();
-      },
-
-      contentArrayWillChange: K,
-
-      contentArrayDidChange: function() {
-        this.rerenderContainingView();
-      },
-
-      lookupContent: function() {
-        return handlebarsGet(this.normalizedRoot, this.normalizedPath, this.options);
-      },
-
-      addArrayObservers: function() {
-        if (!this.content) { return; }
-
-        this.content.addArrayObserver(this, {
-          willChange: 'contentArrayWillChange',
-          didChange: 'contentArrayDidChange'
-        });
-      },
-
-      removeArrayObservers: function() {
-        if (!this.content) { return; }
-
-        this.content.removeArrayObserver(this, {
-          willChange: 'contentArrayWillChange',
-          didChange: 'contentArrayDidChange'
-        });
-      },
-
-      addContentObservers: function() {
-        addBeforeObserver(this.normalizedRoot, this.normalizedPath, this, this.contentWillChange);
-        addObserver(this.normalizedRoot, this.normalizedPath, this, this.contentDidChange);
-      },
-
-      removeContentObservers: function() {
-        removeBeforeObserver(this.normalizedRoot, this.normalizedPath, this.contentWillChange);
-        removeObserver(this.normalizedRoot, this.normalizedPath, this.contentDidChange);
-      },
-
-      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;
-
-        data.insideEach = true;
-        for (var i = 0; i < contentLength; i++) {
-          var context = content.objectAt(i);
-          options.data.keywords[options.hash.keyword] = context;
-          template(context, { data: data });
-        }
-      },
-
-      rerenderContainingView: function() {
-        var self = this;
-        run.scheduleOnce('render', this, function() {
-          // It's possible it's been destroyed after we enqueued a re-render call.
-          if (!self.destroyed) {
-            self.containingView.rerender();
-          }
-        });
-      },
-
-      destroy: function() {
-        this.removeContentObservers();
-        if (this.content) {
-          this.removeArrayObservers();
-        }
-        this.destroyed = true;
-      }
-    };
-
     /**
       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.
+      item in an array.
 
       ```javascript
       var developers = [{name: 'Yehuda'},{name: 'Tom'}, {name: 'Paul'}];
       ```
 
-      ```handlebars
-      {{#each developers}}
-        {{name}}
-        {{! `this` is each developer }}
-      {{/each}}
-      ```
-
-      `{{#each}}` supports an alternative syntax with element naming. This preserves
-      context of the yielded block:
-
       ```handlebars
       {{#each person in developers}}
         {{person.name}}
@@ -8695,8 +7953,8 @@ enifed("ember-handlebars/helpers/each",
       ```
 
       ```handlebars
-      {{#each developerNames}}
-        {{this}}
+      {{#each name in developerNames}}
+        {{name}}
       {{/each}}
       ```
 
@@ -8722,8 +7980,8 @@ enifed("ember-handlebars/helpers/each",
 
       ```handlebars
       <ul>
-      {{#each developers itemViewClass="person"}}
-        {{name}}
+      {{#each developer in developers itemViewClass="person"}}
+        {{developer.name}}
       {{/each}}
       </ul>
       ```
@@ -8754,13 +8012,13 @@ enifed("ember-handlebars/helpers/each",
       ```javascript
       App.PersonView = Ember.View.extend({
         tagName: 'li',
-        template: '{{name}}'
+        template: '{{developer.name}}'
       });
       ```
 
       ```handlebars
       <ul>
-        {{each developers itemViewClass="person"}}
+        {{each developer in developers itemViewClass="person"}}
       </ul>
       ```
 
@@ -8778,8 +8036,8 @@ enifed("ember-handlebars/helpers/each",
 
       ```handlebars
       <ul>
-      {{#each developers emptyViewClass="no-people"}}
-        <li>{{name}}</li>
+      {{#each developer in developers emptyViewClass="no-people"}}
+        <li>{{developer.name}}</li>
       {{/each}}
       </ul>
       ```
@@ -8810,47 +8068,6 @@ enifed("ember-handlebars/helpers/each",
       {{/each}}
       ```
 
-      ### (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).
-
-      ```handlebars
-      {{#group}}
-        {{#each people}}
-          {{firstName}} {{lastName}}
-        {{/each}}
-      {{/group}}
-      ```
-
-      When the membership of `people` changes, or when any property changes, the entire
-      `{{#group}}` block will be re-rendered.
-
-      An `{{#each}}` inside the `{{#group}}` helper can opt-out of the special group
-      behavior by passing the `groupedRows` option. For example:
-
-      ```handlebars
-      {{#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 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.
-
       @method each
       @for Ember.Handlebars.helpers
       @param [name] {String} name for item (used with `in`)
@@ -8859,53 +8076,186 @@ enifed("ember-handlebars/helpers/each",
       @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;
+    function eachHelper(path) {
+      var options = arguments[arguments.length - 1];
       var helperName = 'each';
+      var keywordName;
 
       if (arguments.length === 4) {
         
-        var keywordName = arguments[0];
-
-
-        options = arguments[3];
+        keywordName = arguments[0];
         path = arguments[2];
 
         helperName += ' ' + keywordName + ' in ' + path;
 
-        if (path === '') { path = "this"; }
-
         options.hash.keyword = keywordName;
-
       } else if (arguments.length === 1) {
-        options = path;
-        path = 'this';
+        path = '';
       } else {
         helperName += ' ' + path;
       }
 
+      
+      options.hash.emptyViewClass = Ember._MetamorphView;
       options.hash.dataSourceBinding = path;
-      // Set up emptyView as a metamorph with no tag
-      //options.hash.emptyViewClass = Ember._MetamorphView;
-
-      // can't rely on this default behavior when use strict
-      ctx = this || window;
-
+      options.hashTypes.dataSourceBinding = 'STRING';
       options.helperName = options.helperName || helperName;
 
-      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);
-      }
+      return EmberHandlebars.helpers.collection.call(this, EmberHandlebars.EachView, options);
     }
 
     __exports__.EachView = EachView;
-    __exports__.GroupedEach = GroupedEach;
     __exports__.eachHelper = eachHelper;
   });
+enifed("ember-handlebars/helpers/if_unless",
+  ["ember-metal/core","ember-handlebars-compiler","ember-handlebars/helpers/binding","ember-metal/property_get","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var EmberHandlebars = __dependency2__["default"];
+
+    var bind = __dependency3__.bind;
+
+    var get = __dependency4__.get;
+    var isArray = __dependency5__.isArray;
+
+    var helpers = EmberHandlebars.helpers;
+
+    function shouldDisplayIfHelperContent(result) {
+      var truthy = result && get(result, 'isTruthy');
+      if (typeof truthy === 'boolean') { return truthy; }
+
+      if (isArray(result)) {
+        return get(result, 'length') !== 0;
+      } else {
+        return !!result;
+      }
+    }
+
+    /**
+      Use the `boundIf` helper to create a conditional that re-evaluates
+      whenever the truthiness of the bound value changes.
+
+      ```handlebars
+      {{#boundIf "content.shouldDisplayTitle"}}
+        {{content.title}}
+      {{/boundIf}}
+      ```
+
+      @private
+      @method boundIf
+      @for Ember.Handlebars.helpers
+      @param {String} property Property to bind
+      @param {Function} fn Context to provide for rendering
+      @return {String} HTML string
+    */
+    function boundIfHelper(property, fn) {
+      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this;
+
+      fn.helperName = fn.helperName || 'boundIf';
+
+      return bind.call(context, property, fn, true, shouldDisplayIfHelperContent, shouldDisplayIfHelperContent, [
+       'isTruthy',
+       'length'
+     ]);
+    }
+
+    /**
+      @private
+
+      Use the `unboundIf` helper to create a conditional that evaluates once.
+
+      ```handlebars
+      {{#unboundIf "content.shouldDisplayTitle"}}
+        {{content.title}}
+      {{/unboundIf}}
+      ```
+
+      @method unboundIf
+      @for Ember.Handlebars.helpers
+      @param {String} property Property to bind
+      @param {Function} fn Context to provide for rendering
+      @return {String} HTML string
+      @since 1.4.0
+    */
+    function unboundIfHelper(property, fn) {
+      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this;
+      var data = fn.data;
+      var view = data.view;
+      var template = fn.fn;
+      var inverse = fn.inverse;
+
+      var propertyValue = view.getStream(property).value();
+
+      if (!shouldDisplayIfHelperContent(propertyValue)) {
+        template = inverse;
+      }
+
+      template(context, { data: data });
+    }
+
+    /**
+      See [boundIf](/api/classes/Ember.Handlebars.helpers.html#method_boundIf)
+      and [unboundIf](/api/classes/Ember.Handlebars.helpers.html#method_unboundIf)
+
+      @method if
+      @for Ember.Handlebars.helpers
+      @param {Function} context
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function ifHelper(context, options) {
+            
+      options.helperName = options.helperName || ('if ' + context);
+
+      if (options.data.isUnbound) {
+        return helpers.unboundIf.call(options.contexts[0], context, options);
+      } else {
+        return helpers.boundIf.call(options.contexts[0], context, options);
+      }
+    }
+
+    /**
+      @method unless
+      @for Ember.Handlebars.helpers
+      @param {Function} context
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    function unlessHelper(context, options) {
+            
+      var fn = options.fn;
+      var inverse = options.inverse;
+      var helperName = 'unless';
+
+      if (context) {
+        helperName += ' ' + context;
+      }
+
+      options.fn = inverse;
+      options.inverse = fn;
+
+      options.helperName = options.helperName || helperName;
+
+      if (options.data.isUnbound) {
+        return helpers.unboundIf.call(options.contexts[0], context, options);
+      } else {
+        return helpers.boundIf.call(options.contexts[0], context, options);
+      }
+    }
+
+    __exports__.ifHelper = ifHelper;
+    __exports__.boundIfHelper = boundIfHelper;
+    __exports__.unboundIfHelper = unboundIfHelper;
+    __exports__.unlessHelper = unlessHelper;
+  });
 enifed("ember-handlebars/helpers/loc",
   ["ember-runtime/system/string","exports"],
   function(__dependency1__, __exports__) {
@@ -8952,16 +8302,15 @@ enifed("ember-handlebars/helpers/loc",
     __exports__["default"] = loc;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/is_none","ember-handlebars/helpers/binding","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert
     // var emberAssert = Ember.assert;
 
-    var isNone = __dependency2__.isNone;
-    var handlebarsGet = __dependency3__.handlebarsGet;
-    var bind = __dependency4__.bind;
+    var isNone = __dependency2__["default"];
+    var bind = __dependency3__.bind;
 
     /**
     @module ember
@@ -9002,16 +8351,6 @@ enifed("ember-handlebars/helpers/partial",
       changes, the partial will be re-rendered using the new template
       name.
 
-      ## Setting the partial's context with `with`
-
-      The `partial` helper can be used in conjunction with the `with`
-      helper to set a context that will be used by the partial:
-
-      ```handlebars
-      {{#with currentUser}}
-        {{partial "user_info"}}
-      {{/with}}
-      ```
 
       @method partial
       @for Ember.Handlebars.helpers
@@ -9019,18 +8358,19 @@ enifed("ember-handlebars/helpers/partial",
     */
 
     __exports__["default"] = function partialHelper(name, options) {
+      var view = options.data.view;
 
       var context = (options.contexts && options.contexts.length) ? options.contexts[0] : this;
 
       options.helperName = options.helperName || 'partial';
 
       if (options.types[0] === "ID") {
+        var partialNameStream = view.getStream(name);
         // Helper was passed a property path; we need to
         // create a binding that will re-render whenever
         // this property changes.
         options.fn = function(context, fnOptions) {
-          var partialName = handlebarsGet(context, name, fnOptions);
-          renderPartial(context, partialName, fnOptions);
+          renderPartial(context, partialNameStream.value(), fnOptions);
         };
 
         return bind.call(context, name, options, true, exists);
@@ -9058,26 +8398,9 @@ enifed("ember-handlebars/helpers/partial",
       
       template = template || deprecatedTemplate;
 
-      template(context, { data: options.data });
-    }
-  });
-enifed("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;
-
-      for (var i=0, l=contexts.length; i<l; i++) {
-        ret.push(handlebarsGet(roots[i], contexts[i], { data: data }));
-      }
-
-      return ret;
+      template(context, {
+        data: options.data
+      });
     }
   });
 enifed("ember-handlebars/helpers/template",
@@ -9088,7 +8411,6 @@ enifed("ember-handlebars/helpers/template",
     // Ember.deprecate;
 
     var EmberHandlebars = __dependency2__["default"];
-    var helpers = EmberHandlebars.helpers;
     /**
     @module ember
     @submodule ember-handlebars
@@ -9104,27 +8426,21 @@ enifed("ember-handlebars/helpers/template",
       
       options.helperName = options.helperName || 'template';
 
-      return helpers.partial.apply(this, arguments);
+      return EmberHandlebars.helpers.partial.apply(this, arguments);
     }
   });
 enifed("ember-handlebars/helpers/unbound",
-  ["ember-handlebars-compiler","ember-handlebars/helpers/binding","ember-handlebars/ext","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-handlebars-compiler","ember-handlebars/helpers/binding","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    /*globals Handlebars */
-
     /**
     @module ember
     @submodule ember-handlebars
     */
 
     var EmberHandlebars = __dependency1__["default"];
-    var helpers = EmberHandlebars.helpers;
 
     var resolveHelper = __dependency2__.resolveHelper;
-    var handlebarsGet = __dependency3__.handlebarsGet;
-
-    var slice = [].slice;
 
     /**
       `unbound` allows you to output a property without binding. *Important:* The
@@ -9146,31 +8462,39 @@ enifed("ember-handlebars/helpers/unbound",
       @param {String} property
       @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;
+    __exports__["default"] = function unboundHelper(property) {
+      var argsLength = arguments.length;
+      var options = arguments[argsLength - 1];
+      var view = options.data.view;
+      var container = view.container;
 
-      ctx = this;
-      if (arguments.length > 2) {
-        // Unbound helper call.
+      if (argsLength <= 2) {
+        return view.getStream(property).value();
+      } else {
         options.data.isUnbound = true;
-        helper = resolveHelper(container, property) || helpers.helperMissing;
-        out = helper.apply(ctx, slice.call(arguments, 1));
-        delete options.data.isUnbound;
-        return out;
-      }
+        options.types.shift();
 
-      context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : ctx;
-      return handlebarsGet(context, property, fn);
+        var args = new Array(argsLength - 1);
+        for (var i = 1; i < argsLength; i++) {
+          args[i - 1] = arguments[i];
+        }
+
+        var helper = resolveHelper(container, property) || EmberHandlebars.helpers.helperMissing;
+
+        // Attempt to exec the first field as a helper
+        options.name = arguments[0];
+
+        var result = helper.apply(this, args);
+
+        delete options.data.isUnbound;
+        return result;
+      }
     }
   });
 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__) {
+  ["ember-metal/core","ember-runtime/system/object","ember-metal/property_get","ember-metal/keys","ember-metal/mixin","ember-views/streams/read","ember-views/views/view","ember-metal/streams/simple","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
-    /*globals Handlebars */
-
     /**
     @module ember
     @submodule ember-handlebars
@@ -9182,53 +8506,58 @@ enifed("ember-handlebars/helpers/view",
 
     var EmberObject = __dependency2__["default"];
     var get = __dependency3__.get;
-    var set = __dependency4__.set;
+    var keys = __dependency4__["default"];
     var IS_BINDING = __dependency5__.IS_BINDING;
-    var jQuery = __dependency6__["default"];
+    var readViewFactory = __dependency6__.readViewFactory;
     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 SimpleStream = __dependency8__["default"];
 
-
-    var LOWERCASE_A_Z = /^[a-z]/;
-    var VIEW_PREFIX = /^view\./;
-
-    function makeBindings(thisContext, options) {
+    function makeBindings(options) {
       var hash = options.hash;
-      var hashType = options.hashTypes;
+      var hashTypes = options.hashTypes;
+      var view = options.data.view;
 
       for (var prop in hash) {
-        if (hashType[prop] === 'ID') {
+        var hashType = hashTypes[prop];
+        var value = hash[prop];
 
-          var value = hash[prop];
+        if (IS_BINDING.test(prop)) {
+          // classBinding is processed separately
+          if (prop === 'classBinding') {
+            continue;
+          }
 
-          if (IS_BINDING.test(prop)) {
-                      } else {
-            hash[prop + 'Binding'] = value;
-            hashType[prop + 'Binding'] = 'STRING';
+          if (hashType === 'ID') {
+                        hash[prop] = view._getBindingForStream(value);
+          } else if (typeof value === 'string') {
+            hash[prop] = view._getBindingForStream(value);
+          }
+        } else {
+          if (hashType === 'ID') {
+            if (prop === 'class') {
+              hash.classBinding = value;
+            } else {
+              hash[prop + 'Binding'] = view._getBindingForStream(value);
+            }
             delete hash[prop];
-            delete hashType[prop];
+            delete hashTypes[prop];
           }
         }
       }
 
-      if (hash.hasOwnProperty('idBinding')) {
+      if (hash.idBinding) {
         // id can't be bound, so just perform one-time lookup.
-        hash.id = handlebarsGet(thisContext, hash.idBinding, options);
-        hashType.id = 'STRING';
+        hash.id = hash.idBinding.value();
+        hashTypes.id = 'STRING';
         delete hash.idBinding;
-        delete hashType.idBinding;
+        delete hashTypes.idBinding;
       }
     }
 
     var ViewHelper = EmberObject.create({
       propertiesFromHTMLOptions: function(options) {
+        var view    = options.data.view;
         var hash    = options.hash;
-        var data    = options.data;
         var classes = hash['class'];
 
         var extensions = {
@@ -9266,91 +8595,43 @@ enifed("ember-handlebars/helpers/view",
         // 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);
+          var prop = hashKeys[i];
 
           if (prop !== 'classNameBindings') {
             extensions[prop] = hash[prop];
           }
-
-          // Test if the property ends in "Binding"
-          if (isBinding && typeof extensions[prop] === 'string') {
-            path = this.contextualizeBindingPath(hash[prop], data);
-            if (path) {
-              extensions[prop] = path;
-            }
-          }
         }
 
-        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];
-
-            if (typeof full === 'string') {
-              // Contextualize the path of classNameBinding so this:
-              //
-              //     classNameBinding="isGreen:green"
-              //
-              // is converted to this:
-              //
-              //     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;
-                }
-              }
+        var classNameBindings = extensions.classNameBindings;
+        if (classNameBindings) {
+          for (var j = 0; j < classNameBindings.length; j++) {
+            var parsedPath = View._parsePropertyPath(classNameBindings[j]);
+            if (parsedPath.path === '') {
+              parsedPath.stream = new SimpleStream(true);
+            } else {
+              parsedPath.stream = view.getStream(parsedPath.path);
             }
+            classNameBindings[j] = parsedPath;
           }
         }
 
         return extensions;
       },
 
-      // Transform bindings from the current context to a context that can be evaluated within the view.
-      // Returns null if the path shouldn't be changed.
-      //
-      // TODO: consider the addition of a prefix that would allow this method to return `path`.
-      contextualizeBindingPath: function(path, data) {
-        var normalized = normalizePath(null, path, data);
-        if (normalized.isKeyword) {
-          return 'templateData.keywords.' + path;
-        } else if (isGlobalPath(path)) {
-          return null;
-        } else if (path === 'this' || path === '') {
-          if (data.insideGroup && data.insideEach) { return 'context'; }
-          return '_parentView.context';
-        } else {
-          return '_parentView.context.' + path;
-        }
-      },
-
-      helper: function(thisContext, path, options) {
+      helper: function(thisContext, newView, options) {
         var data = options.data;
         var fn   = options.fn;
-        var newView;
-        var newViewProto;
 
-        makeBindings(thisContext, options);
-
-        var container = this.container || (data && data.view && data.view.container);
-        newView = handlebarsGetView(thisContext, path, container, options);
-
-        if (View.detectInstance(newView)) {
-          newViewProto = newView;
-        } else {
-          newViewProto = newView.proto();
-        }
+        makeBindings(options);
 
         var viewOptions = this.propertiesFromHTMLOptions(options, thisContext);
         var currentView = data.view;
         viewOptions.templateData = data;
+        var newViewProto = newView.proto();
 
         if (fn) {
                     viewOptions.template = fn;
@@ -9369,7 +8650,7 @@ enifed("ember-handlebars/helpers/view",
         var data = options.data;
         var fn   = options.fn;
 
-        makeBindings(thisContext, options);
+        makeBindings(options);
 
         
         var viewOptions = this.propertiesFromHTMLOptions(options, thisContext);
@@ -9382,7 +8663,8 @@ enifed("ember-handlebars/helpers/view",
 
         // 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) {
+        if (!newView.controller && !newView.controllerBinding &&
+            !viewOptions.controller && !viewOptions.controllerBinding) {
           viewOptions._context = thisContext;
         }
 
@@ -9568,26 +8850,191 @@ enifed("ember-handlebars/helpers/view",
       @param {Hash} options
       @return {String} HTML string
     */
-    function viewHelper(path, options) {
+    function viewHelper(path) {
       
+      var options = arguments[arguments.length - 1];
+      var types = options.types;
+      var view = options.data.view;
+      var container = view.container || view._keywords.view.value().container;
+      var viewClass;
+
       // If no path is provided, treat path param as options
       // 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');
+      if (arguments.length === 1) {
+        if (container) {
+          viewClass = container.lookupFactory('view:toplevel');
         } else {
-          path = View;
+          viewClass = View;
         }
+      } else {
+        var pathStream;
+        if (typeof path === 'string' && types[0] === 'ID') {
+          pathStream = view.getStream(path);
+                  } else {
+          pathStream = path;
+        }
+
+        viewClass = readViewFactory(pathStream, container);
       }
 
       options.helperName = options.helperName || 'view';
 
-      return ViewHelper.helper(this, path, options);
+      return ViewHelper.helper(this, viewClass, options);
     }
 
     __exports__.viewHelper = viewHelper;
   });
+enifed("ember-handlebars/helpers/with",
+  ["ember-metal/core","ember-metal/property_set","ember-metal/utils","ember-metal/platform","ember-metal/is_none","ember-handlebars/helpers/binding","ember-handlebars/views/handlebars_bound_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-handlebars
+    */
+
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+
+    var set = __dependency2__.set;
+    var apply = __dependency3__.apply;
+    var o_create = __dependency4__.create;
+    var isNone = __dependency5__["default"];
+    var bind = __dependency6__.bind;
+    var _HandlebarsBoundView = __dependency7__._HandlebarsBoundView;
+
+    function exists(value) {
+      return !isNone(value);
+    }
+
+    var WithView = _HandlebarsBoundView.extend({
+      init: function() {
+        apply(this, this._super, arguments);
+
+        var keywordName     = this.templateHash.keywordName;
+        var controllerName  = this.templateHash.controller;
+
+        if (controllerName) {
+          var previousContext = this.previousContext;
+          var controller = this.container.lookupFactory('controller:'+controllerName).create({
+            parentController: previousContext,
+            target: previousContext
+          });
+
+          this._generatedController = controller;
+
+          if (this.preserveContext) {
+            this._keywords[keywordName] = controller;
+            this.lazyValue.subscribe(function(modelStream) {
+              set(controller, 'model', modelStream.value());
+            });
+          } else {
+            set(this, 'controller', controller);
+            this.valueNormalizerFunc = function(result) {
+              controller.set('model', result);
+              return controller;
+            };
+          }
+
+          set(controller, 'model', this.lazyValue.value());
+        }
+      },
+
+      willDestroy: function() {
+        this._super();
+
+        if (this._generatedController) {
+          this._generatedController.destroy();
+        }
+      }
+    });
+
+    /**
+      Use the `{{with}}` helper when you want to aliases the to a new name. It's helpful
+      for semantic clarity and to retain default scope or to reference from another
+      `{{with}}` block.
+
+      ```handlebars
+      // posts might not be
+      {{#with user.posts as blogPosts}}
+        <div class="notice">
+          There are {{blogPosts.length}} blog posts written by {{user.name}}.
+        </div>
+
+        {{#each post in blogPosts}}
+          <li>{{post.title}}</li>
+        {{/each}}
+      {{/with}}
+      ```
+
+      Without the `as` operator, it would be impossible to reference `user.name` in the example above.
+
+      NOTE: The alias should not reuse a name from the bound property path.
+      For example: `{{#with foo.bar as foo}}` is not supported because it attempts to alias using
+      the first part of the property path, `foo`. Instead, use `{{#with foo.bar as baz}}`.
+
+      ### `controller` option
+
+      Adding `controller='something'` instructs the `{{with}}` helper to create and use an instance of
+      the specified controller wrapping the aliased keyword.
+
+      This is very similar to using an `itemController` option with the `{{each}}` helper.
+
+      ```handlebars
+      {{#with users.posts as posts controller='userBlogPosts'}}
+        {{!- `posts` is wrapped in our controller instance }}
+      {{/with}}
+      ```
+
+      In the above example, the `posts` keyword is now wrapped in the `userBlogPost` controller,
+      which provides an elegant way to decorate the context with custom
+      functions/properties.
+
+      @method with
+      @for Ember.Handlebars.helpers
+      @param {Function} context
+      @param {Hash} options
+      @return {String} HTML string
+    */
+    __exports__["default"] = function withHelper(contextPath) {
+      var options = arguments[arguments.length - 1];
+      var view = options.data.view;
+      var bindContext, preserveContext;
+      var helperName = 'with';
+
+      if (arguments.length === 4) {
+        
+        var keywordName = arguments[2];
+
+        if (contextPath) {
+          helperName += ' ' + contextPath + ' as ' + keywordName;
+        }
+
+        
+        var localizedOptions = o_create(options);
+        localizedOptions.data = o_create(options.data);
+
+        localizedOptions.keywords = {};
+        localizedOptions.keywords[keywordName] = view.getStream(contextPath);
+
+        localizedOptions.hash.keywordName = keywordName;
+
+        bindContext = this;
+        options = localizedOptions;
+        preserveContext = true;
+      } else {
+        
+                
+        helperName += ' ' + contextPath;
+        bindContext = options.contexts[0];
+        preserveContext = false;
+      }
+
+      options.helperName = helperName;
+
+      return bind.call(bindContext, contextPath, options, preserveContext, exists, undefined, undefined, WithView);
+    }
+  });
 enifed("ember-handlebars/helpers/yield",
   ["ember-metal/core","ember-metal/property_get","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
@@ -9819,7 +9266,7 @@ enifed("ember-handlebars/string",
       @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
     */
     function htmlSafe(str) {
-      if (str === undefined || str === null) {
+      if (str === null || str === undefined) {
         return "";
       }
 
@@ -9853,10 +9300,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__) {
+  ["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-handlebars/string","ember-views/views/states","ember-handlebars/views/metamorph_view","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
-    /*globals Handlebars, Metamorph:true */
     /*jshint newcap:false*/
 
 
@@ -9867,7 +9313,6 @@ enifed("ember-handlebars/views/handlebars_bound_view",
 
     var EmberHandlebars = __dependency1__["default"];
     // EmberHandlebars.SafeString;
-    var SafeString = EmberHandlebars.SafeString;
 
     var Ember = __dependency2__["default"];
     // Ember.K
@@ -9878,21 +9323,16 @@ enifed("ember-handlebars/views/handlebars_bound_view",
     var set = __dependency5__.set;
     var merge = __dependency6__["default"];
     var run = __dependency7__["default"];
-    var View = __dependency8__["default"];
-    var htmlSafe = __dependency9__["default"];
-    var cloneStates = __dependency10__.cloneStates;
-    var states = __dependency10__.states;
-    var viewStates = states;
+    var htmlSafe = __dependency8__["default"];
+    var cloneStates = __dependency9__.cloneStates;
+    var viewStates = __dependency9__.states;
 
-    var _MetamorphView = __dependency11__["default"];
-    var handlebarsGet = __dependency12__.handlebarsGet;
-    var uuid = __dependency13__.uuid;
+    var _MetamorphView = __dependency10__["default"];
+    var uuid = __dependency11__.uuid;
 
-    function SimpleHandlebarsView(path, pathRoot, isEscaped, templateData) {
-      this.path = path;
-      this.pathRoot = pathRoot;
+    function SimpleHandlebarsView(lazyValue, isEscaped) {
+      this.lazyValue = lazyValue;
       this.isEscaped = isEscaped;
-      this.templateData = templateData;
       this[Ember.GUID_KEY] = uuid();
       this._lastNormalizedValue = undefined;
       this.state = 'preRender';
@@ -9923,23 +9363,11 @@ enifed("ember-handlebars/views/handlebars_bound_view",
       propertyDidChange: K,
 
       normalizedValue: function() {
-        var path = this.path;
-        var pathRoot = this.pathRoot;
-        var escape = this.isEscaped;
-        var result, templateData;
+        var result = this.lazyValue.value();
 
-        // Use the pathRoot as the result if no path is provided. This
-        // happens if the path is `this`, which gets normalized into
-        // a `pathRoot` of the current Handlebars context and a path
-        // of `''`.
-        if (path === '') {
-          result = pathRoot;
-        } else {
-          templateData = this.templateData;
-          result = handlebarsGet(pathRoot, path, { data: templateData });
-        }
-
-        if (!escape && !(result instanceof SafeString)) {
+        if (result === null || result === undefined) {
+          result = "";
+        } else if (!this.isEscaped && !(result instanceof EmberHandlebars.SafeString)) {
           result = htmlSafe(result);
         }
 
@@ -9970,7 +9398,7 @@ enifed("ember-handlebars/views/handlebars_bound_view",
       update: function () {
         this.updateId = null;
         var value = this.normalizedValue();
-        // doesn't diff SafeString instances
+        // doesn't diff EmberHandlebars.SafeString instances
         if (value !== this._lastNormalizedValue) {
           this._lastNormalizedValue = value;
           this._morph.update(value);
@@ -9982,7 +9410,7 @@ enifed("ember-handlebars/views/handlebars_bound_view",
       }
     };
 
-    states = cloneStates(viewStates);
+    var states = cloneStates(viewStates);
 
     merge(states._default, {
       rerenderIfNeeded: K
@@ -10070,49 +9498,12 @@ enifed("ember-handlebars/views/handlebars_bound_view",
       */
       inverseTemplate: null,
 
-
-      /**
-        The path to look up on `pathRoot` that is passed to
-        `shouldDisplayFunc` to determine which template to render.
-
-        In addition, if `preserveContext` is `false,` the object at this path will
-        be passed to the template when rendering.
-
-        @property path
-        @type String
-        @default null
-      */
-      path: null,
-
-      /**
-        The object from which the `path` will be looked up. Sometimes this is the
-        same as the `previousContext`, but in cases where this view has been
-        generated for paths that start with a keyword such as `view` or
-        `controller`, the path root will be that resolved object.
-
-        @property pathRoot
-        @type Object
-      */
-      pathRoot: null,
+      lazyValue: null,
 
       normalizedValue: function() {
-        var path = get(this, 'path');
-        var pathRoot  = get(this, 'pathRoot');
+        var value = this.lazyValue.value();
         var valueNormalizer = get(this, 'valueNormalizerFunc');
-        var result, templateData;
-
-        // Use the pathRoot as the result if no path is provided. This
-        // happens if the path is `this`, which gets normalized into
-        // a `pathRoot` of the current Handlebars context and a path
-        // of `''`.
-        if (path === '') {
-          result = pathRoot;
-        } else {
-          templateData = get(this, 'templateData');
-          result = handlebarsGet(pathRoot, path, { data: templateData });
-        }
-
-        return valueNormalizer ? valueNormalizer(result) : result;
+        return valueNormalizer ? valueNormalizer(value) : value;
       },
 
       rerenderIfNeeded: function() {
@@ -10171,7 +9562,7 @@ enifed("ember-handlebars/views/handlebars_bound_view",
             // expression to the render context and return.
               if (result === null || result === undefined) {
                 result = "";
-              } else if (!(result instanceof SafeString)) {
+              } else if (!(result instanceof EmberHandlebars.SafeString)) {
                 result = String(result);
               }
 
@@ -10200,11 +9591,9 @@ enifed("ember-handlebars/views/handlebars_bound_view",
     __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__) {
+  ["ember-metal/core","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
-    /* global Metamorph:true */
-
     /*jshint newcap:false*/
     var Ember = __dependency1__["default"];
     // Ember.deprecate
@@ -10212,17 +9601,12 @@ enifed("ember-handlebars/views/metamorph_view",
     var CoreView = __dependency2__["default"];
     var View = __dependency3__["default"];
     var Mixin = __dependency4__.Mixin;
-    var run = __dependency5__["default"];
 
     /**
     @module ember
     @submodule ember-handlebars
     */
 
-    function notifyMutationListeners() {
-      run.once(View, 'notifyMutationListeners');
-    }
-
     // The `morph` and `outerHTML` properties are internal only
     // and not observable.
 
@@ -10249,8 +9633,8 @@ enifed("ember-handlebars/views/metamorph_view",
       @uses Ember._Metamorph
       @private
     */
-    var _MetamorphView = View.extend(_Metamorph);
-    __exports__._MetamorphView = _MetamorphView;
+    __exports__["default"] = View.extend(_Metamorph);
+
     /**
       @class _SimpleMetamorphView
       @namespace Ember
@@ -10259,7 +9643,7 @@ enifed("ember-handlebars/views/metamorph_view",
       @private
     */
     var _SimpleMetamorphView = CoreView.extend(_Metamorph);
-    __exports__._SimpleMetamorphView = _SimpleMetamorphView;__exports__["default"] = View.extend(_Metamorph);
+    __exports__._SimpleMetamorphView = _SimpleMetamorphView;
   });
 enifed("ember-metal-views",
   ["ember-metal-views/renderer","exports"],
@@ -10310,7 +9694,7 @@ enifed("ember-metal-views/renderer",
       var level = 0;
 
       var view = _view;
-      var children, i, l, child;
+      var children, i, child;
       while (length) {
         elements[level] = element;
         if (!view._morph) {
@@ -10383,7 +9767,7 @@ enifed("ember-metal-views/renderer",
 
       this.insertElement(view, _parentView, element, insertAt);
 
-      for (i=total-1;i>=0;i--) {
+      for (i=total-1; i>=0; i--) {
         if (willInsert) {
           views[i]._elementInserted = true;
           this.didInsertElement(views[i]);
@@ -10409,7 +9793,7 @@ enifed("ember-metal-views/renderer",
         }
                 view._morph = morph;
         var viewId = this.uuid(view);
-        this._inserts[viewId] = this.scheduleRender(this, function() {
+        this._inserts[viewId] = this.scheduleRender(this, function scheduledRenderTree() {
           this._inserts[viewId] = null;
           this.renderTree(view);
         });
@@ -10442,8 +9826,7 @@ enifed("ember-metal-views/renderer",
       var removeQueue = [];
       var destroyQueue = [];
       var morph = _view._morph;
-      var  idx, len, view, staticChildren, queue,
-        childViews, i, l, parentView;
+      var idx, len, view, queue, childViews, i, l;
 
       removeQueue.push(_view);
 
@@ -10573,30 +9956,30 @@ enifed("ember-metal",
     var Ember = __dependency1__["default"];
     var merge = __dependency2__["default"];
     var instrument = __dependency3__.instrument;
+    var reset = __dependency3__.reset;
     var subscribe = __dependency3__.subscribe;
     var unsubscribe = __dependency3__.unsubscribe;
-    var reset = __dependency3__.reset;
-    var generateGuid = __dependency4__.generateGuid;
-    var GUID_KEY = __dependency4__.GUID_KEY;
-    var guidFor = __dependency4__.guidFor;
-    var META_DESC = __dependency4__.META_DESC;
     var EMPTY_META = __dependency4__.EMPTY_META;
-    var meta = __dependency4__.meta;
-    var getMeta = __dependency4__.getMeta;
-    var setMeta = __dependency4__.setMeta;
-    var metaPath = __dependency4__.metaPath;
-    var inspect = __dependency4__.inspect;
-    var typeOf = __dependency4__.typeOf;
-    var tryCatchFinally = __dependency4__.tryCatchFinally;
-    var isArray = __dependency4__.isArray;
-    var makeArray = __dependency4__.makeArray;
-    var canInvoke = __dependency4__.canInvoke;
-    var tryInvoke = __dependency4__.tryInvoke;
-    var tryFinally = __dependency4__.tryFinally;
-    var wrap = __dependency4__.wrap;
+    var GUID_KEY = __dependency4__.GUID_KEY;
+    var META_DESC = __dependency4__.META_DESC;
     var apply = __dependency4__.apply;
     var applyStr = __dependency4__.applyStr;
+    var canInvoke = __dependency4__.canInvoke;
+    var generateGuid = __dependency4__.generateGuid;
+    var getMeta = __dependency4__.getMeta;
+    var guidFor = __dependency4__.guidFor;
+    var inspect = __dependency4__.inspect;
+    var isArray = __dependency4__.isArray;
+    var makeArray = __dependency4__.makeArray;
+    var meta = __dependency4__.meta;
+    var metaPath = __dependency4__.metaPath;
+    var setMeta = __dependency4__.setMeta;
+    var tryCatchFinally = __dependency4__.tryCatchFinally;
+    var tryFinally = __dependency4__.tryFinally;
+    var tryInvoke = __dependency4__.tryInvoke;
+    var typeOf = __dependency4__.typeOf;
     var uuid = __dependency4__.uuid;
+    var wrap = __dependency4__.wrap;
     var EmberError = __dependency5__["default"];
     var EnumerableUtils = __dependency6__["default"];
     var Cache = __dependency7__["default"];
@@ -10608,55 +9991,55 @@ enifed("ember-metal",
     var map = __dependency9__.map;
     var Logger = __dependency10__["default"];
 
+    var _getPath = __dependency11__._getPath;
     var get = __dependency11__.get;
     var getWithDefault = __dependency11__.getWithDefault;
     var normalizeTuple = __dependency11__.normalizeTuple;
-    var _getPath = __dependency11__._getPath;
 
-    var on = __dependency12__.on;
     var addListener = __dependency12__.addListener;
+    var hasListeners = __dependency12__.hasListeners;
+    var listenersDiff = __dependency12__.listenersDiff;
+    var listenersFor = __dependency12__.listenersFor;
+    var listenersUnion = __dependency12__.listenersUnion;
+    var on = __dependency12__.on;
     var removeListener = __dependency12__.removeListener;
+    var sendEvent = __dependency12__.sendEvent;
     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 ObserverSet = __dependency13__["default"];
 
-    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 endPropertyChanges = __dependency14__.endPropertyChanges;
+    var overrideChains = __dependency14__.overrideChains;
+    var propertyDidChange = __dependency14__.propertyDidChange;
+    var propertyWillChange = __dependency14__.propertyWillChange;
 
     var Descriptor = __dependency15__.Descriptor;
     var defineProperty = __dependency15__.defineProperty;
     var set = __dependency16__.set;
     var trySet = __dependency16__.trySet;
 
-    var OrderedSet = __dependency17__.OrderedSet;
     var Map = __dependency17__.Map;
     var MapWithDefault = __dependency17__.MapWithDefault;
+    var OrderedSet = __dependency17__.OrderedSet;
     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 flushPendingChains = __dependency21__.flushPendingChains;
+    var removeChainWatcher = __dependency21__.removeChainWatcher;
     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 isWatching = __dependency23__.isWatching;
+    var rewatch = __dependency23__.rewatch;
+    var unwatch = __dependency23__.unwatch;
+    var watch = __dependency23__.watch;
     var expandProperties = __dependency24__["default"];
     var ComputedProperty = __dependency25__.ComputedProperty;
     var computed = __dependency25__.computed;
@@ -10664,34 +10047,32 @@ enifed("ember-metal",
 
     // 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 _suspendObserver = __dependency27__._suspendObserver;
     var _suspendObservers = __dependency27__._suspendObservers;
+    var addBeforeObserver = __dependency27__.addBeforeObserver;
+    var addObserver = __dependency27__.addObserver;
     var beforeObserversFor = __dependency27__.beforeObserversFor;
+    var observersFor = __dependency27__.observersFor;
     var removeBeforeObserver = __dependency27__.removeBeforeObserver;
+    var removeObserver = __dependency27__.removeObserver;
     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 immediateObserver = __dependency28__.immediateObserver;
+    var mixin = __dependency28__.mixin;
+    var observer = __dependency28__.observer;
+    var required = __dependency28__.required;
     var Binding = __dependency29__.Binding;
-    var isGlobalPath = __dependency29__.isGlobalPath;
     var bind = __dependency29__.bind;
+    var isGlobalPath = __dependency29__.isGlobalPath;
     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 isNone = __dependency32__["default"];
+    var isEmpty = __dependency33__["default"];
     var isBlank = __dependency34__["default"];
     var isPresent = __dependency35__["default"];
     var keys = __dependency36__["default"];
@@ -10844,11 +10225,7 @@ enifed("ember-metal",
     Ember.libraries.registerCoreLibrary('Ember', Ember.VERSION);
 
     Ember.isNone = isNone;
-    Ember.none = none;
-
     Ember.isEmpty = isEmpty;
-    Ember.empty = empty;
-
     Ember.isBlank = isBlank;
 
     
@@ -10889,26 +10266,28 @@ enifed("ember-metal",
     __exports__["default"] = Ember;
   });
 enifed("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__) {
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/core","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__, __dependency9__, __exports__) {
     "use strict";
     var get = __dependency1__.get;
     var set = __dependency2__.set;
-    var EmberError = __dependency3__["default"];
-    var Descriptor = __dependency4__.Descriptor;
-    var defineProperty = __dependency4__.defineProperty;
-    var ComputedProperty = __dependency5__.ComputedProperty;
-    var create = __dependency6__.create;
-    var meta = __dependency7__.meta;
-    var inspect = __dependency7__.inspect;
-    var addDependentKeys = __dependency8__.addDependentKeys;
-    var removeDependentKeys = __dependency8__.removeDependentKeys;
+    var Ember = __dependency3__["default"];
+    // Ember.assert
+    var EmberError = __dependency4__["default"];
+    var Descriptor = __dependency5__.Descriptor;
+    var defineProperty = __dependency5__.defineProperty;
+    var ComputedProperty = __dependency6__.ComputedProperty;
+    var create = __dependency7__.create;
+    var meta = __dependency8__.meta;
+    var inspect = __dependency8__.inspect;
+    var addDependentKeys = __dependency9__.addDependentKeys;
+    var removeDependentKeys = __dependency9__.removeDependentKeys;
 
-    function alias(altKey) {
+    __exports__["default"] = function alias(altKey) {
       return new AliasedProperty(altKey);
     }
 
-    __exports__.alias = alias;function AliasedProperty(altKey) {
+    function AliasedProperty(altKey) {
       this.altKey = altKey;
       this._dependentKeys = [ altKey ];
     }
@@ -10932,7 +10311,7 @@ enifed("ember-metal/alias",
     };
 
     AliasedProperty.prototype.setup = function(obj, keyName) {
-      var m = meta(obj);
+            var m = meta(obj);
       if (m.watching[keyName]) {
         addDependentKeys(this, obj, keyName, m);
       }
@@ -11106,7 +10485,6 @@ enifed("ember-metal/binding",
     var Ember = __dependency1__["default"];
     // Ember.Logger, Ember.LOG_BINDINGS, assert
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
     var trySet = __dependency3__.trySet;
     var guidFor = __dependency4__.guidFor;
     var addObserver = __dependency5__.addObserver;
@@ -11268,7 +10646,9 @@ enifed("ember-metal/binding",
         addObserver(obj, fromPath, this, this.fromDidChange);
 
         // if the binding is a two-way binding, also set up an observer on the target
-        if (!this._oneWay) { addObserver(obj, toPath, this, this.toDidChange); }
+        if (!this._oneWay) {
+          addObserver(obj, toPath, this, this.toDidChange);
+        }
 
         this._readyToSync = true;
 
@@ -11292,7 +10672,9 @@ enifed("ember-metal/binding",
         removeObserver(obj, this._from, this, this.fromDidChange);
 
         // if the binding is two-way, remove the observer from the target as well
-        if (twoWay) { removeObserver(obj, this._to, this, this.toDidChange); }
+        if (twoWay) {
+          removeObserver(obj, this._to, this, this.toDidChange);
+        }
 
         this._readyToSync = false; // disable scheduled syncs...
         return this;
@@ -11606,10 +10988,7 @@ enifed("ember-metal/cache",
       this.func   = func;
     }
 
-    var FALSE     = function() { };
-    var ZERO      = function() { };
     var UNDEFINED = function() { };
-    var NULL      = function() { };
 
     Cache.prototype = {
       set: function(key, value) {
@@ -11658,12 +11037,11 @@ enifed("ember-metal/chains",
     // warn, assert, etc;
     var get = __dependency2__.get;
     var normalizeTuple = __dependency2__.normalizeTuple;
-    var meta = __dependency3__.meta;
+    var metaFor = __dependency3__.meta;
     var forEach = __dependency4__.forEach;
     var watchKey = __dependency5__.watchKey;
     var unwatchKey = __dependency5__.unwatchKey;
 
-    var metaFor = meta;
     var warn = Ember.warn;
     var FIRST_KEY = /^([^\.]+)/;
 
@@ -11682,9 +11060,12 @@ enifed("ember-metal/chains",
       var queue = pendingQueue;
       pendingQueue = [];
 
-      forEach.call(queue, function(q) { q[0].add(q[1]); });
+      forEach.call(queue, function(q) {
+        q[0].add(q[1]);
+      });
 
-      warn('Watching an undefined global, Ember expects watched globals to be setup by the time the run loop is flushed, check for typos', pendingQueue.length === 0);
+      warn('Watching an undefined global, Ember expects watched globals to be' +
+           ' setup by the time the run loop is flushed, check for typos', pendingQueue.length === 0);
     }
 
     __exports__.flushPendingChains = flushPendingChains;function addChainWatcher(obj, keyName, node) {
@@ -11697,7 +11078,9 @@ enifed("ember-metal/chains",
         nodes = m.chainWatchers = {};
       }
 
-      if (!nodes[keyName]) { nodes[keyName] = []; }
+      if (!nodes[keyName]) {
+        nodes[keyName] = [];
+      }
       nodes[keyName].push(node);
       watchKey(obj, keyName, m);
     }
@@ -11741,7 +11124,9 @@ enifed("ember-metal/chains",
       this._paths = {};
       if (this._watching) {
         this._object = parent.value();
-        if (this._object) { addChainWatcher(this._object, this._key, this); }
+        if (this._object) {
+          addChainWatcher(this._object, this._key, this);
+        }
       }
 
       // Special-case: the EachProxy relies on immediate evaluation to
@@ -11761,9 +11146,13 @@ enifed("ember-metal/chains",
 
       var meta = obj['__ember_meta__'];
       // check if object meant only to be a prototype
-      if (meta && meta.proto === obj) return undefined;
+      if (meta && meta.proto === obj) {
+        return undefined;
+      }
 
-      if (key === "@each") return get(obj, key);
+      if (key === "@each") {
+        return get(obj, key);
+      }
 
       // if a CP only return cached value
       var desc = meta && meta.descs[key];
@@ -11789,7 +11178,9 @@ enifed("ember-metal/chains",
     ChainNodePrototype.destroy = function() {
       if (this._watching) {
         var obj = this._object;
-        if (obj) { removeChainWatcher(obj, this._key, this); }
+        if (obj) {
+          removeChainWatcher(obj, this._key, this);
+        }
         this._watching = false; // so future calls do nothing
       }
     };
@@ -11801,7 +11192,10 @@ enifed("ember-metal/chains",
       var path;
 
       for (path in paths) {
-        if (paths[path] <= 0) { continue; } // this check will also catch non-number vals.
+        // this check will also catch non-number vals.
+        if (paths[path] <= 0) {
+          continue;
+        }
         ret.add(path);
       }
       return ret;
@@ -11848,7 +11242,9 @@ enifed("ember-metal/chains",
       var obj, tuple, key, src, paths;
 
       paths = this._paths;
-      if (paths[path] > 0) { paths[path]--; }
+      if (paths[path] > 0) {
+        paths[path]--;
+      }
 
       obj = this.value();
       tuple = normalizeTuple(obj, path);
@@ -11871,10 +11267,14 @@ enifed("ember-metal/chains",
     ChainNodePrototype.chain = function(key, path, src) {
       var chains = this._chains;
       var node;
-      if (!chains) { chains = this._chains = {}; }
+      if (!chains) {
+        chains = this._chains = {};
+      }
 
       node = chains[key];
-      if (!node) { node = chains[key] = new ChainNode(this, key, src); }
+      if (!node) {
+        node = chains[key] = new ChainNode(this, key, src);
+      }
       node.count++; // count chains...
 
       // chain rest of path if there is one
@@ -11890,10 +11290,10 @@ enifed("ember-metal/chains",
       var node = chains[key];
 
       // unchain rest of path first...
-      if (path && path.length>1) {
-        key  = firstKey(path);
-        path = path.slice(key.length+1);
-        node.unchain(key, path);
+      if (path && path.length > 1) {
+        var nextKey  = firstKey(path);
+        var nextPath = path.slice(nextKey.length + 1);
+        node.unchain(nextKey, nextPath);
       }
 
       // delete node if needed.
@@ -11909,16 +11309,22 @@ enifed("ember-metal/chains",
       var chains = this._chains;
       if (chains) {
         for(var key in chains) {
-          if (!chains.hasOwnProperty(key)) { continue; }
+          if (!chains.hasOwnProperty(key)) {
+            continue;
+          }
           chains[key].willChange(events);
         }
       }
 
-      if (this._parent) { this._parent.chainWillChange(this, this._key, 1, events); }
+      if (this._parent) {
+        this._parent.chainWillChange(this, this._key, 1, events);
+      }
     };
 
     ChainNodePrototype.chainWillChange = function(chain, path, depth, events) {
-      if (this._key) { path = this._key + '.' + path; }
+      if (this._key) {
+        path = this._key + '.' + path;
+      }
 
       if (this._parent) {
         this._parent.chainWillChange(this, path, depth+1, events);
@@ -11934,7 +11340,10 @@ enifed("ember-metal/chains",
     };
 
     ChainNodePrototype.chainDidChange = function(chain, path, depth, events) {
-      if (this._key) { path = this._key + '.' + path; }
+      if (this._key) {
+        path = this._key + '.' + path;
+      }
+
       if (this._parent) {
         this._parent.chainDidChange(this, path, depth+1, events);
       } else {
@@ -11961,8 +11370,9 @@ enifed("ember-metal/chains",
 
         // Special-case: the EachProxy relies on immediate evaluation to
         // establish its observers.
-        if (this._parent && this._parent._key === '@each')
+        if (this._parent && this._parent._key === '@each') {
           this.value();
+        }
       }
 
       // then notify chains...
@@ -11975,22 +11385,30 @@ enifed("ember-metal/chains",
       }
 
       // if no events are passed in then we only care about the above wiring update
-      if (events === null) { return; }
+      if (events === null) {
+        return;
+      }
 
       // and finally tell parent about my path changing...
-      if (this._parent) { this._parent.chainDidChange(this, this._key, 1, events); }
+      if (this._parent) {
+        this._parent.chainDidChange(this, this._key, 1, events);
+      }
     };
 
     function finishChains(obj) {
       // We only create meta if we really have to
-      var m = obj['__ember_meta__'],
-        chains, chainWatchers, chainNodes;
+      var m = obj['__ember_meta__'];
+      var 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; }
+            if (!chainWatchers.hasOwnProperty(key)) {
+              continue;
+            }
+
             chainNodes = chainWatchers[key];
             if (chainNodes) {
               for (var i=0,l=chainNodes.length;i<l;i++) {
@@ -12011,29 +11429,26 @@ enifed("ember-metal/chains",
     __exports__.ChainNode = ChainNode;
   });
 enifed("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__) {
+  ["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__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var meta = __dependency4__.meta;
-    var inspect = __dependency4__.inspect;
-    var expandProperties = __dependency5__["default"];
-    var EmberError = __dependency6__["default"];
-    var Descriptor = __dependency7__.Descriptor;
-    var defineProperty = __dependency7__.defineProperty;
-    var propertyWillChange = __dependency8__.propertyWillChange;
-    var propertyDidChange = __dependency8__.propertyDidChange;
-    var addDependentKeys = __dependency9__.addDependentKeys;
-    var removeDependentKeys = __dependency9__.removeDependentKeys;
+    var set = __dependency1__.set;
+    var meta = __dependency2__.meta;
+    var inspect = __dependency2__.inspect;
+    var expandProperties = __dependency3__["default"];
+    var EmberError = __dependency4__["default"];
+    var Descriptor = __dependency5__.Descriptor;
+    var defineProperty = __dependency5__.defineProperty;
+    var propertyWillChange = __dependency6__.propertyWillChange;
+    var propertyDidChange = __dependency6__.propertyDidChange;
+    var addDependentKeys = __dependency7__.addDependentKeys;
+    var removeDependentKeys = __dependency7__.removeDependentKeys;
 
     /**
     @module ember-metal
     */
 
     
-
     var metaFor = meta;
     var a_slice = [].slice;
 
@@ -12044,18 +11459,18 @@ enifed("ember-metal/computed",
     //
 
     /**
-      A computed property transforms an objects function into a property.
+      A computed property transforms an object's function into a property.
 
       By default the function backing the computed property will only be called
       once and the result will be cached. You can specify various properties
-      that your computed property is dependent on. This will force the cached
+      that your computed property depends on. This will force the cached
       result to be recomputed if the dependencies are modified.
 
       In the following example we declare a computed property (by calling
-      `.property()` on the fullName function) and setup the properties
+      `.property()` on the fullName function) and setup the property
       dependencies (depending on firstName and lastName). The fullName function
       will be called once (regardless of how many times it is accessed) as long
-      as it's dependencies have not been changed. Once firstName or lastName are updated
+      as its dependencies have not changed. Once firstName or lastName are updated
       any future calls (or anything bound) to fullName will incorporate the new
       values.
 
@@ -12128,6 +11543,10 @@ enifed("ember-metal/computed",
       func.__ember_arity__ = func.length;
       this.func = func;
 
+      this._dependentKeys = undefined;
+      this._suspended = undefined;
+      this._meta = undefined;
+
       this._cacheable = (opts && opts.cacheable !== undefined) ? opts.cacheable : true;
       this._dependentKeys = opts && opts.dependentKeys;
       this._readOnly = opts && (opts.readOnly !== undefined || !!opts.readOnly) || false;
@@ -12136,9 +11555,6 @@ enifed("ember-metal/computed",
     ComputedProperty.prototype = new Descriptor();
 
     var ComputedPropertyPrototype = ComputedProperty.prototype;
-    ComputedPropertyPrototype._dependentKeys = undefined;
-    ComputedPropertyPrototype._suspended = undefined;
-    ComputedPropertyPrototype._meta = undefined;
 
     /**
       Properties are cacheable by default. Computed property will automatically
@@ -12350,7 +11766,9 @@ enifed("ember-metal/computed",
         }
 
         chainNodes = meta.chainWatchers && meta.chainWatchers[keyName];
-        if (chainNodes) { finishChains(chainNodes); }
+        if (chainNodes) {
+          finishChains(chainNodes);
+        }
         addDependentKeys(this, obj, keyName, meta);
       } else {
         ret = this.func.call(obj, keyName);
@@ -12592,7 +12010,9 @@ enifed("ember-metal/computed",
       var cache = meta && meta.cache;
       var ret = cache && cache[key];
 
-      if (ret === UNDEFINED) { return undefined; }
+      if (ret === UNDEFINED) {
+        return undefined;
+      }
       return ret;
     }
 
@@ -12606,7 +12026,9 @@ enifed("ember-metal/computed",
 
     cacheFor.get = function(cache, key) {
       var ret = cache[key];
-      if (ret === UNDEFINED) { return undefined; }
+      if (ret === UNDEFINED) {
+        return undefined;
+      }
       return ret;
     };
 
@@ -12627,8 +12049,8 @@ enifed("ember-metal/computed_macros",
     var set = __dependency3__.set;
     var computed = __dependency4__.computed;
     var isEmpty = __dependency5__["default"];
-    var isNone = __dependency6__.isNone;
-    var alias = __dependency7__.alias;
+    var isNone = __dependency6__["default"];
+    var alias = __dependency7__["default"];
 
     /**
     @module ember-metal
@@ -13132,7 +12554,7 @@ enifed("ember-metal/computed_macros",
       values of all passed in properties to an array.
     */
     registerComputedWithProperties('collect', function(properties) {
-      var res = [];
+      var res = Ember.A();
       for (var key in properties) {
         if (properties.hasOwnProperty(key)) {
           if (isNone(properties[key])) {
@@ -13325,7 +12747,7 @@ enifed("ember-metal/core",
   ["exports"],
   function(__exports__) {
     "use strict";
-    /*globals Ember:true,Em:true,ENV,EmberENV,MetamorphENV:true */
+    /*globals Ember:true,ENV,EmberENV,MetamorphENV:true */
 
     /**
     @module ember
@@ -13349,7 +12771,7 @@ enifed("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.8.1
+      @version 1.9.0
     */
 
     if ('undefined' === typeof Ember) {
@@ -13359,9 +12781,9 @@ enifed("ember-metal/core",
     }
 
     // Default imports, exports and lookup to the global object;
-    var imports = Ember.imports = Ember.imports || this;
-    var exports = Ember.exports = Ember.exports || this;
-    var lookup  = Ember.lookup  = Ember.lookup  || this;
+    Ember.imports = Ember.imports || this;
+    Ember.lookup  = Ember.lookup  || this;
+    var exports   = Ember.exports = Ember.exports || this;
 
     // aliases needed to keep minifiers from removing the global context
     exports.Em = exports.Ember = Ember;
@@ -13376,10 +12798,10 @@ enifed("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.8.1'
+      @default '1.9.0'
       @static
     */
-    Ember.VERSION = '1.8.1';
+    Ember.VERSION = '1.9.0';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -13494,7 +12916,7 @@ enifed("ember-metal/core",
     Ember.LOG_STACKTRACE_ON_DEPRECATION = (Ember.ENV.LOG_STACKTRACE_ON_DEPRECATION !== false);
 
     /**
-      Determines whether Ember should add ECMAScript 5 shims to older browsers.
+      Determines whether Ember should add ECMAScript 5 Array shims to older browsers.
 
       @property SHIM_ES5
       @type Boolean
@@ -13518,10 +12940,10 @@ enifed("ember-metal/core",
       @private
       @return {Object}
     */
-    var K = function() { return this; };
-    var K = K;
-    __exports__.K = K;Ember.K = K;
-    //TODO: ES6 GLOBL TODO
+    function K() { return this; }
+    __exports__.K = K;
+    Ember.K = K;
+    //TODO: ES6 GLOBAL TODO
 
     // Stub out the methods defined by the ember-debug package in case it's not loaded
 
@@ -13985,14 +13407,13 @@ enifed("ember-metal/events",
     @module ember-metal
     */
     var Ember = __dependency1__["default"];
-    var meta = __dependency2__.meta;
+    var metaFor = __dependency2__.meta;
     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;
@@ -14033,21 +13454,26 @@ enifed("ember-metal/events",
     function actionsFor(obj, eventName) {
       var meta = metaFor(obj, true);
       var actions;
+      var listeners = meta.listeners;
 
-      if (!meta.listeners) { meta.listeners = {}; }
-
-      if (!meta.hasOwnProperty('listeners')) {
+      if (!listeners) {
+        listeners = meta.listeners = create(null);
+        listeners.__source__ = obj;
+      } else if (listeners.__source__ !== obj) {
         // setup inherited copy of the listeners object
-        meta.listeners = create(meta.listeners);
+        listeners = meta.listeners = create(listeners);
+        listeners.__source__ = obj;
       }
 
-      actions = meta.listeners[eventName];
+      actions = listeners[eventName];
 
       // if there are actions, but the eventName doesn't exist in our listeners, then copy them from the prototype
-      if (actions && !meta.listeners.hasOwnProperty(eventName)) {
-        actions = meta.listeners[eventName] = meta.listeners[eventName].slice();
+      if (actions && actions.__source__ !== obj) {
+        actions = listeners[eventName] = listeners[eventName].slice();
+        actions.__source__ = obj;
       } else if (!actions) {
-        actions = meta.listeners[eventName] = [];
+        actions = listeners[eventName] = [];
+        actions.__source__ = obj;
       }
 
       return actions;
@@ -14098,7 +13524,7 @@ enifed("ember-metal/events",
       @for Ember
       @param obj
       @param {String} eventName
-      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Object|Function} target A target object or a function
       @param {Function|String} method A function or the name of a function to be called on `target`
       @param {Boolean} once A flag whether a function should only be called once
     */
@@ -14133,7 +13559,7 @@ enifed("ember-metal/events",
       @for Ember
       @param obj
       @param {String} eventName
-      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Object|Function} target A target object or a function
       @param {Function|String} method A function or the name of a function to be called on `target`
     */
     function removeListener(obj, eventName, target, method) {
@@ -14184,7 +13610,7 @@ enifed("ember-metal/events",
       @private
       @param obj
       @param {String} eventName
-      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Object|Function} target A target object or a function
       @param {Function|String} method A function or the name of a function to be called on `target`
       @param {Function} callback
     */
@@ -14215,8 +13641,8 @@ enifed("ember-metal/events",
 
       @private
       @param obj
-      @param {Array} eventName Array of event names
-      @param {Object|Function} targetOrMethod A target object or a function
+      @param {Array} eventNames Array of event names
+      @param {Object|Function} target A target object or a function
       @param {Function|String} method A function or the name of a function to be called on `target`
       @param {Function} callback
     */
@@ -14266,8 +13692,11 @@ enifed("ember-metal/events",
       var listeners = obj['__ember_meta__'].listeners, ret = [];
 
       if (listeners) {
-        for(var eventName in listeners) {
-          if (listeners[eventName]) { ret.push(eventName); }
+        for (var eventName in listeners) {
+          if (eventName !== '__source__' &&
+              listeners[eventName]) {
+            ret.push(eventName);
+          }
         }
       }
       return ret;
@@ -14534,6 +13963,56 @@ enifed("ember-metal/get_properties",
       return ret;
     }
   });
+enifed("ember-metal/injected_property",
+  ["ember-metal/core","ember-metal/computed","ember-metal/properties","ember-metal/platform","ember-metal/utils","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var ComputedProperty = __dependency2__.ComputedProperty;
+    var Descriptor = __dependency3__.Descriptor;
+    var create = __dependency4__.create;
+    var inspect = __dependency5__.inspect;
+    var EmberError = __dependency6__["default"];
+
+    /**
+      Read-only property that returns the result of a container lookup.
+
+      @class InjectedProperty
+      @namespace Ember
+      @extends Ember.Descriptor
+      @constructor
+      @param {String} type The container type the property will lookup
+      @param {String} name (optional) The name the property will lookup, defaults
+             to the property's name
+    */
+    function InjectedProperty(type, name) {
+      this.type = type;
+      this.name = name;
+
+      this._super$Constructor(function(keyName) {
+        
+        return this.container.lookup(type + ':' + (name || keyName));
+      }, { readOnly: true });
+    }
+
+    InjectedProperty.prototype = create(Descriptor.prototype);
+
+    var InjectedPropertyPrototype = InjectedProperty.prototype;
+    var ComputedPropertyPrototype = ComputedProperty.prototype;
+
+    InjectedPropertyPrototype._super$Constructor = ComputedProperty;
+
+    InjectedPropertyPrototype.get = ComputedPropertyPrototype.get;
+
+    InjectedPropertyPrototype.set = function(obj, keyName) {
+      throw new EmberError("Cannot set injected property '" + keyName + "' on object: " + inspect(obj));
+    };
+
+    InjectedPropertyPrototype.teardown = ComputedPropertyPrototype.teardown;
+
+    __exports__["default"] = InjectedProperty;
+  });
 enifed("ember-metal/instrumentation",
   ["ember-metal/core","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
@@ -14761,12 +14240,10 @@ enifed("ember-metal/instrumentation",
     __exports__.reset = reset;
   });
 enifed("ember-metal/is_blank",
-  ["ember-metal/core","ember-metal/is_empty","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+  ["ember-metal/is_empty","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    // deprecateFunc
-    var isEmpty = __dependency2__["default"];
+    var isEmpty = __dependency1__["default"];
 
     /**
       A value is blank if it is empty or a whitespace string.
@@ -14796,13 +14273,11 @@ enifed("ember-metal/is_blank",
     }
   });
 enifed("ember-metal/is_empty",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/is_none","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/property_get","ember-metal/is_none","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    // deprecateFunc
-    var get = __dependency2__.get;
-    var isNone = __dependency3__["default"];
+    var get = __dependency1__.get;
+    var isNone = __dependency2__["default"];
 
     /**
       Verifies that a value is `null` or an empty string, empty array,
@@ -14817,6 +14292,7 @@ enifed("ember-metal/is_empty",
       Ember.isEmpty(undefined);       // true
       Ember.isEmpty('');              // true
       Ember.isEmpty([]);              // true
+      Ember.isEmpty({});              // false
       Ember.isEmpty('Adam Hawkins');  // false
       Ember.isEmpty([0,1,2]);         // false
       ```
@@ -14859,19 +14335,12 @@ enifed("ember-metal/is_empty",
       return false;
     }
 
-    var empty = Ember.deprecateFunc("Ember.empty is deprecated. Please use Ember.isEmpty instead.", isEmpty);
-    __exports__.empty = empty;
     __exports__["default"] = isEmpty;
-    __exports__.isEmpty = isEmpty;
-    __exports__.empty = empty;
   });
 enifed("ember-metal/is_none",
-  ["ember-metal/core","exports"],
-  function(__dependency1__, __exports__) {
+  ["exports"],
+  function(__exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    // deprecateFunc
-
     /**
       Returns true if the passed value is null or undefined. This avoids errors
       from JSLint complaining about use of ==, which can be technically
@@ -14895,10 +14364,7 @@ enifed("ember-metal/is_none",
       return obj === null || obj === undefined;
     }
 
-    var none = Ember.deprecateFunc("Ember.none is deprecated. Please use Ember.isNone instead.", isNone);
-    __exports__.none = none;
     __exports__["default"] = isNone;
-    __exports__.isNone = isNone;
   });
 enifed("ember-metal/is_present",
   ["ember-metal/is_blank","exports"],
@@ -14978,7 +14444,8 @@ enifed("ember-metal/keys",
             throw new TypeError('Object.keys called on non-object');
           }
 
-          var result = [], prop, i;
+          var result = [];
+          var prop, i;
 
           for (prop in obj) {
             if (prop !== '_super' &&
@@ -15068,8 +14535,12 @@ enifed("ember-metal/logger",
       var method = typeof consoleObj === 'object' ? consoleObj[name] : null;
 
       if (method) {
-        // Older IE doesn't support apply, but Chrome needs it
-        if (typeof method.apply === 'function') {
+        // Older IE doesn't support bind, but Chrome needs it
+        if (typeof method.bind === 'function') {
+          logToConsole = method.bind(consoleObj);
+          logToConsole.displayName = 'console.' + name;
+          return logToConsole;
+        } else if (typeof method.apply === 'function') {
           logToConsole = function() {
             method.apply(consoleObj, arguments);
           };
@@ -15581,7 +15052,8 @@ enifed("ember-metal/map",
 
       /**
         Iterate over all the keys and values. Calls the function once
-        for each key, passing in the key and value, in that order.
+        for each key, passing in value, key, and the map being iterated over,
+        in that order.
 
         The keys are guaranteed to be iterated over in insertion order.
 
@@ -15604,11 +15076,11 @@ enifed("ember-metal/map",
         if (length === 2) {
           thisArg = arguments[1];
           cb = function(key) {
-            callback.call(thisArg, map.get(key), key);
+            callback.call(thisArg, map.get(key), key, map);
           };
         } else {
           cb = function(key) {
-            callback(map.get(key), key);
+            callback(map.get(key), key, map);
           };
         }
 
@@ -15745,8 +15217,8 @@ enifed("ember-metal/merge",
     }
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/merge","ember-metal/array","ember-metal/platform","ember-metal/property_get","ember-metal/property_set","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__, __dependency12__, __dependency13__, __exports__) {
         // Remove "use strict"; from transpiled module until
     // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
     //
@@ -15760,35 +15232,33 @@ enifed("ember-metal/mixin",
     var Ember = __dependency1__["default"];
     // warn, assert, wrap, et;
     var merge = __dependency2__["default"];
-    var map = __dependency3__.map;
-    var indexOf = __dependency3__.indexOf;
-    var forEach = __dependency3__.forEach;
-    var create = __dependency4__.create;
-    var guidFor = __dependency5__.guidFor;
-    var meta = __dependency5__.meta;
-    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;
-    var ComputedProperty = __dependency8__.ComputedProperty;
-    var Binding = __dependency9__.Binding;
-    var addObserver = __dependency10__.addObserver;
-    var removeObserver = __dependency10__.removeObserver;
-    var addBeforeObserver = __dependency10__.addBeforeObserver;
-    var removeBeforeObserver = __dependency10__.removeBeforeObserver;
-    var addListener = __dependency11__.addListener;
-    var removeListener = __dependency11__.removeListener;
+    var a_indexOf = __dependency3__.indexOf;
+    var a_forEach = __dependency3__.forEach;
+    var o_create = __dependency4__.create;
+    var get = __dependency5__.get;
+    var set = __dependency6__.set;
+    var trySet = __dependency6__.trySet;
+    var guidFor = __dependency7__.guidFor;
+    var metaFor = __dependency7__.meta;
+    var wrap = __dependency7__.wrap;
+    var makeArray = __dependency7__.makeArray;
+    var apply = __dependency7__.apply;
+    var isArray = __dependency7__.isArray;
+    var expandProperties = __dependency8__["default"];
+    var Descriptor = __dependency9__.Descriptor;
+    var defineProperty = __dependency9__.defineProperty;
+    var ComputedProperty = __dependency10__.ComputedProperty;
+    var Binding = __dependency11__.Binding;
+    var addObserver = __dependency12__.addObserver;
+    var removeObserver = __dependency12__.removeObserver;
+    var addBeforeObserver = __dependency12__.addBeforeObserver;
+    var removeBeforeObserver = __dependency12__.removeBeforeObserver;
+    var _suspendObserver = __dependency12__._suspendObserver;
+    var addListener = __dependency13__.addListener;
+    var removeListener = __dependency13__.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;
 
     function superFunction(){
       var func = this.__nextSuper;
@@ -15816,26 +15286,15 @@ enifed("ember-metal/mixin",
       return ret;
     }
 
-    function initMixin(mixin, args) {
-      if (args && args.length > 0) {
-        mixin.mixins = a_map.call(args, function(x) {
-          if (x instanceof Mixin) { return x; }
-
-          // Note: Manually setup a primitive mixin here. This is the only
-          // way to actually get a primitive mixin. This way normal creation
-          // of mixins will give you combined mixins...
-          var mixin = new Mixin();
-          mixin.properties = x;
-          return mixin;
-        });
-      }
-      return mixin;
-    }
-
     function isMethod(obj) {
       return 'function' === typeof obj &&
              obj.isMethod !== false &&
-             obj !== Boolean && obj !== Object && obj !== Number && obj !== Array && obj !== Date && obj !== String;
+             obj !== Boolean &&
+             obj !== Object &&
+             obj !== Number &&
+             obj !== Array &&
+             obj !== Date &&
+             obj !== String;
     }
 
     var CONTINUE = {};
@@ -15891,6 +15350,10 @@ enifed("ember-metal/mixin",
       return property;
     }
 
+    var sourceAvailable = (function() {
+      return this;
+    }).toString().indexOf('return this;') > -1;
+
     function giveMethodSuper(obj, key, method, values, descs) {
       var superMethod;
 
@@ -15909,7 +15372,21 @@ enifed("ember-metal/mixin",
         return method;
       }
 
-      return wrap(method, superMethod);
+      var hasSuper;
+      if (sourceAvailable) {
+        hasSuper = method.__hasSuper;
+
+        if (hasSuper === undefined) {
+          hasSuper = method.toString().indexOf('_super') > -1;
+          method.__hasSuper = hasSuper;
+        }
+      }
+
+      if (sourceAvailable === false || hasSuper) {
+        return wrap(method, superMethod);
+      } else {
+        return method;
+      }
     }
 
     function applyConcatenatedProperties(obj, key, value, values) {
@@ -15917,7 +15394,11 @@ enifed("ember-metal/mixin",
 
       if (baseValue) {
         if ('function' === typeof baseValue.concat) {
-          return baseValue.concat(value);
+          if (value === null || value === undefined) {
+            return baseValue;
+          } else {
+            return baseValue.concat(value);
+          }
         } else {
           return makeArray(baseValue).concat(value);
         }
@@ -16032,6 +15513,31 @@ enifed("ember-metal/mixin",
       }
     }
 
+    function connectStreamBinding(obj, key, stream) {
+      var onNotify = function(stream) {
+        _suspendObserver(obj, key, null, didChange, function() {
+          trySet(obj, key, stream.value());
+        });
+      };
+
+      var didChange = function() {
+        stream.setValue(get(obj, key), onNotify);
+      };
+
+      // Initialize value
+      set(obj, key, stream.value());
+
+      addObserver(obj, key, null, didChange);
+
+      stream.subscribe(onNotify);
+
+      if (obj._streamBindingSubscriptions === undefined) {
+        obj._streamBindingSubscriptions = o_create(null);
+      }
+
+      obj._streamBindingSubscriptions[key] = onNotify;
+    }
+
     function connectBindings(obj, m) {
       // TODO Mixin.apply(instance) should disconnect binding if exists
       var bindings = m.bindings;
@@ -16041,7 +15547,10 @@ enifed("ember-metal/mixin",
           binding = bindings[key];
           if (binding) {
             to = key.slice(0, -7); // strip Binding off end
-            if (binding instanceof Binding) {
+            if (binding.isStream) {
+              connectStreamBinding(obj, to, binding);
+              continue;
+            } else if (binding instanceof Binding) {
               binding = binding.copy(); // copy prototypes' instance
               binding.to(to);
             } else { // binding is string path
@@ -16219,12 +15728,29 @@ enifed("ember-metal/mixin",
       @namespace Ember
     */
     __exports__["default"] = Mixin;
-    function Mixin() { return initMixin(this, arguments); }
-    Mixin.prototype = {
-      properties: null,
-      mixins: null,
-      ownerConstructor: null
-    };
+    function Mixin(args, properties) {
+      this.properties = properties;
+
+      var length = args && args.length;
+
+      if (length > 0) {
+        var m = new Array(length);
+
+        for (var i = 0; i < length; i++) {
+          var x = args[i];
+          if (x instanceof Mixin) {
+            m[i] = x;
+          } else {
+            m[i] = new Mixin(undefined, x);
+          }
+        }
+
+        this.mixins = m;
+      } else {
+        this.mixins = undefined;
+      }
+      this.ownerConstructor = undefined;
+    }
 
     Mixin._apply = applyMixin;
 
@@ -16247,7 +15773,12 @@ enifed("ember-metal/mixin",
       // ES6TODO: this relies on a global state?
       Ember.anyUnprocessedMixins = true;
       var M = this;
-      return initMixin(new M(), arguments);
+      var length = arguments.length;
+      var args = new Array(length);
+      for (var i = 0; i < length; i++) {
+        args[i] = arguments[i];
+      }
+      return new M(args, undefined);
     };
 
     var MixinPrototype = Mixin.prototype;
@@ -16257,12 +15788,11 @@ enifed("ember-metal/mixin",
       @param arguments*
     */
     MixinPrototype.reopen = function() {
-      var mixin, tmp;
+      var mixin;
 
       if (this.properties) {
-        mixin = Mixin.create();
-        mixin.properties = this.properties;
-        delete this.properties;
+        mixin = new Mixin(undefined, this.properties);
+        this.properties = undefined;
         this.mixins = [mixin];
       } else if (!this.mixins) {
         this.mixins = [];
@@ -16278,9 +15808,7 @@ enifed("ember-metal/mixin",
         if (mixin instanceof Mixin) {
           mixins.push(mixin);
         } else {
-          tmp = Mixin.create();
-          tmp.properties = mixin;
-          mixins.push(tmp);
+          mixins.push(new Mixin(undefined, mixin));
         }
       }
 
@@ -16332,7 +15860,7 @@ enifed("ember-metal/mixin",
     };
 
     MixinPrototype.without = function() {
-      var ret = new Mixin(this);
+      var ret = new Mixin([this]);
       ret._without = a_slice.call(arguments);
       return ret;
     };
@@ -16357,7 +15885,9 @@ enifed("ember-metal/mixin",
       var ret = [];
       _keys(keys, this, seen);
       for(var key in keys) {
-        if (keys.hasOwnProperty(key)) { ret.push(key); }
+        if (keys.hasOwnProperty(key)) {
+          ret.push(key);
+        }
       }
       return ret;
     };
@@ -16637,12 +16167,12 @@ enifed("ember-metal/observer",
       @for Ember
       @param obj
       @param {String} path
-      @param {Object|Function} targetOrMethod
+      @param {Object|Function} target
       @param {Function|String} [method]
     */
-    function removeObserver(obj, _path, target, method) {
-      unwatch(obj, _path);
-      removeListener(obj, changeEvent(_path), target, method);
+    function removeObserver(obj, path, target, method) {
+      unwatch(obj, path);
+      removeListener(obj, changeEvent(path), target, method);
 
       return this;
     }
@@ -16652,12 +16182,12 @@ enifed("ember-metal/observer",
       @for Ember
       @param obj
       @param {String} path
-      @param {Object|Function} targetOrMethod
+      @param {Object|Function} target
       @param {Function|String} [method]
     */
-    function addBeforeObserver(obj, _path, target, method) {
-      addListener(obj, beforeEvent(_path), target, method);
-      watch(obj, _path);
+    function addBeforeObserver(obj, path, target, method) {
+      addListener(obj, beforeEvent(path), target, method);
+      watch(obj, path);
 
       return this;
     }
@@ -16693,12 +16223,12 @@ enifed("ember-metal/observer",
       @for Ember
       @param obj
       @param {String} path
-      @param {Object|Function} targetOrMethod
+      @param {Object|Function} target
       @param {Function|String} [method]
     */
-    function removeBeforeObserver(obj, _path, target, method) {
-      unwatch(obj, _path);
-      removeListener(obj, beforeEvent(_path), target, method);
+    function removeBeforeObserver(obj, path, target, method) {
+      unwatch(obj, path);
+      removeListener(obj, beforeEvent(path), target, method);
 
       return this;
     }
@@ -16786,16 +16316,34 @@ enifed("ember-metal/path_cache",
     var IS_GLOBAL_PATH = /^([A-Z$]|([0-9][A-Z$])).*[\.]/;
     var HAS_THIS       = 'this.';
 
-    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 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 firstDotIndexCache  = new Cache(1000, function(key) { return key.indexOf('.');             });
+
+    var firstKeyCache = new Cache(1000, function(path) {
+      var index = firstDotIndexCache.get(path);
+      if (index === -1) {
+        return path;
+      } else {
+        return path.slice(0, index);
+      }
+    });
+
+    var tailPathCache = new Cache(1000, function(path) {
+      var index = firstDotIndexCache.get(path);
+      if (index !== -1) {
+        return path.slice(index + 1);
+      }
+    });
 
     var caches = {
-      isGlobalCache:     isGlobalCache,
-      isGlobalPathCache: isGlobalPathCache,
-      hasThisCache:      hasThisCache,
-      isPathCache:       isPathCache
+      isGlobalCache:      isGlobalCache,
+      isGlobalPathCache:  isGlobalPathCache,
+      hasThisCache:       hasThisCache,
+      firstDotIndexCache: firstDotIndexCache,
+      firstKeyCache:      firstKeyCache,
+      tailPathCache:      tailPathCache
     };
     __exports__.caches = caches;
     function isGlobal(path) {
@@ -16811,10 +16359,18 @@ enifed("ember-metal/path_cache",
     }
 
     __exports__.hasThis = hasThis;function isPath(path) {
-      return isPathCache.get(path);
+      return firstDotIndexCache.get(path) !== -1;
     }
 
-    __exports__.isPath = isPath;
+    __exports__.isPath = isPath;function getFirstKey(path) {
+      return firstKeyCache.get(path);
+    }
+
+    __exports__.getFirstKey = getFirstKey;function getTailPath(path) {
+      return tailPathCache.get(path);
+    }
+
+    __exports__.getTailPath = getTailPath;
   });
 enifed("ember-metal/platform",
   ["ember-metal/platform/define_property","ember-metal/platform/define_properties","ember-metal/platform/create","exports"],
@@ -17226,6 +16782,7 @@ enifed("ember-metal/properties",
 
       return this;
     }
+
     __exports__.defineProperty = defineProperty;
   });
 enifed("ember-metal/property_events",
@@ -17268,9 +16825,18 @@ enifed("ember-metal/property_events",
       var proto = m && m.proto;
       var desc = m && m.descs[keyName];
 
-      if (!watching) { return; }
-      if (proto === obj) { return; }
-      if (desc && desc.willChange) { desc.willChange(obj, keyName); }
+      if (!watching) {
+        return;
+      }
+
+      if (proto === obj) {
+        return;
+      }
+
+      if (desc && desc.willChange) {
+        desc.willChange(obj, keyName);
+      }
+
       dependentKeysWillChange(obj, keyName, m);
       chainsWillChange(obj, keyName, m);
       notifyBeforeObservers(obj, keyName);
@@ -17297,11 +16863,18 @@ enifed("ember-metal/property_events",
       var proto = m && m.proto;
       var desc = m && m.descs[keyName];
 
-      if (proto === obj) { return; }
+      if (proto === obj) {
+        return;
+      }
 
       // shouldn't this mean that we're watching this key?
-      if (desc && desc.didChange) { desc.didChange(obj, keyName); }
-      if (!watching && keyName !== 'length') { return; }
+      if (desc && desc.didChange) {
+        desc.didChange(obj, keyName);
+      }
+
+      if (!watching && keyName !== 'length') {
+        return;
+      }
 
       if (m && m.deps && m.deps[keyName]) {
         dependentKeysDidChange(obj, keyName, m);
@@ -17320,9 +16893,16 @@ enifed("ember-metal/property_events",
       if (meta && meta.deps && (deps = meta.deps[depKey])) {
         var seen = WILL_SEEN;
         var top = !seen;
-        if (top) { seen = WILL_SEEN = {}; }
+
+        if (top) {
+          seen = WILL_SEEN = {};
+        }
+
         iterDeps(propertyWillChange, obj, deps, depKey, seen, meta);
-        if (top) { WILL_SEEN = null; }
+
+        if (top) {
+          WILL_SEEN = null;
+        }
       }
     }
 
@@ -17334,15 +16914,26 @@ enifed("ember-metal/property_events",
       if (meta && meta.deps && (deps = meta.deps[depKey])) {
         var seen = DID_SEEN;
         var top = !seen;
-        if (top) { seen = DID_SEEN = {}; }
+
+        if (top) {
+          seen = DID_SEEN = {};
+        }
+
         iterDeps(propertyDidChange, obj, deps, depKey, seen, meta);
-        if (top) { DID_SEEN = null; }
+
+        if (top) {
+          DID_SEEN = null;
+        }
       }
     }
 
     function keysOf(obj) {
       var keys = [];
-      for (var key in obj) keys.push(key);
+
+      for (var key in obj) {
+        keys.push(key);
+      }
+
       return keys;
     }
 
@@ -17350,8 +16941,15 @@ enifed("ember-metal/property_events",
       var keys, key, i, desc;
       var guid = guidFor(obj);
       var current = seen[guid];
-      if (!current) current = seen[guid] = {};
-      if (current[depKey]) return;
+
+      if (!current) {
+        current = seen[guid] = {};
+      }
+
+      if (current[depKey]) {
+        return;
+      }
+
       current[depKey] = true;
 
       if (deps) {
@@ -17360,7 +16958,11 @@ enifed("ember-metal/property_events",
         for (i=0; i<keys.length; i++) {
           key = keys[i];
           desc = descs[key];
-          if (desc && desc._suspended === obj) continue;
+
+          if (desc && desc._suspended === obj) {
+            continue;
+          }
+
           method(obj, key);
         }
       }
@@ -17829,7 +17431,6 @@ enifed("ember-metal/run_loop",
       onErrorMethod: 'onerror'
     });
     var slice = [].slice;
-    var concat = [].concat;
 
     // ..........................................................
     // run - this is ideally the only public API the dev sees
@@ -17904,45 +17505,45 @@ enifed("ember-metal/run_loop",
       @return {Object} Return value from invoking the passed function. Please note,
       when called within an existing loop, no return value is possible.
     */
-    run.join = function(target, method /* args */) {
-      if (!run.currentRunLoop) {
-        return Ember.run.apply(Ember, arguments);
-      }
-
-      var args = slice.call(arguments);
-      args.unshift('actions');
-      run.schedule.apply(run, args);
+    run.join = function() {
+      return backburner.join.apply(backburner, arguments);
     };
 
     /**
-      Provides a useful utility for when integrating with non-Ember libraries
-      that provide asynchronous callbacks.
+      Allows you to specify which context to call the specified function in while
+      adding the execution of that function to the Ember run loop. This ability
+      makes this method a great way to asynchronusly integrate third-party libraries
+      into your Ember application.
 
-      Ember utilizes a run-loop to batch and coalesce changes. This works by
-      marking the start and end of Ember-related Javascript execution.
+      `run.bind` takes two main arguments, the desired context and the function to
+      invoke in that context. Any additional arguments will be supplied as arguments
+      to the function that is passed in.
 
-      When using events such as a View's click handler, Ember wraps the event
-      handler in a run-loop, but when integrating with non-Ember libraries this
-      can be tedious.
-
-      For example, the following is rather verbose but is the correct way to combine
-      third-party events and Ember code.
+      Let's use the creation of a TinyMCE component as an example. Currently,
+      TinyMCE provides a setup configuration option we can use to do some processing
+      after the TinyMCE instance is initialized but before it is actually rendered.
+      We can use that setup option to do some additional setup for our component.
+      The component itself could look something like the following:
 
       ```javascript
-      var that = this;
-      jQuery(window).on('resize', function(){
-        run(function(){
-          that.handleResize();
-        });
+      App.RichTextEditorComponent = Ember.Component.extend({
+        initializeTinyMCE: function(){
+          tinymce.init({
+            selector: '#' + this.$().prop('id'),
+            setup: Ember.run.bind(this, this.setupEditor)
+          });
+        }.on('didInsertElement'),
+
+        setupEditor: function(editor) {
+          this.set('editor', editor);
+          editor.on('change', function(){ console.log('content changed!')} );
+        }
       });
       ```
 
-      To reduce the boilerplate, the following can be used to construct a
-      run-loop-wrapped callback handler.
-
-      ```javascript
-      jQuery(window).on('resize', run.bind(this, this.handleResize));
-      ```
+      In this example, we use Ember.run.bind to bind the setupEditor message to the
+      context of the App.RichTextEditorComponent and to have the invocation of that
+      method be safely handled and excuted by the Ember run loop.
 
       @method bind
       @namespace Ember
@@ -17955,7 +17556,7 @@ enifed("ember-metal/run_loop",
       when called within an existing loop, no return value is possible.
       @since 1.4.0
     */
-    run.bind = function(target, method /* args*/) {
+    run.bind = function(target, method /* args */) {
       var args = slice.call(arguments);
       return function() {
         return run.join.apply(run, args.concat(slice.call(arguments)));
@@ -18128,10 +17729,14 @@ 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.once = function(target, method) {
+    run.once = function(/*target, method */) {
       checkAutoRun();
-      var args = slice.call(arguments);
-      args.unshift('actions');
+      var length = arguments.length;
+      var args = new Array(length);
+      args[0] = 'actions';
+      for (var i = 0; i < length; i++) {
+        args[i + 1] = arguments[i];
+      }
       return apply(backburner, backburner.scheduleOnce, args);
     };
 
@@ -18467,6 +18072,315 @@ enifed("ember-metal/set_properties",
       return obj;
     }
   });
+enifed("ember-metal/streams/read",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    function read(object) {
+      if (object && object.isStream) {
+        return object.value();
+      } else {
+        return object;
+      }
+    }
+
+    __exports__.read = read;function readArray(array) {
+      var length = array.length;
+      var ret = new Array(length);
+      for (var i = 0; i < length; i++) {
+        ret[i] = read(array[i]);
+      }
+      return ret;
+    }
+
+    __exports__.readArray = readArray;function readHash(object) {
+      var ret = {};
+      for (var key in object) {
+        ret[key] = read(object[key]);
+      }
+      return ret;
+    }
+
+    __exports__.readHash = readHash;
+  });
+enifed("ember-metal/streams/simple",
+  ["ember-metal/merge","ember-metal/streams/stream","ember-metal/platform","ember-metal/streams/read","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var merge = __dependency1__["default"];
+    var Stream = __dependency2__["default"];
+    var create = __dependency3__.create;
+    var read = __dependency4__.read;
+
+    function SimpleStream(source) {
+      this.source = source;
+
+      if (source && source.isStream) {
+        source.subscribe(this._didChange, this);
+      }
+    }
+
+    SimpleStream.prototype = create(Stream.prototype);
+
+    merge(SimpleStream.prototype, {
+      valueFn: function() {
+        return read(this.source);
+      },
+
+      setValue: function(value) {
+        var source = this.source;
+
+        if (source && source.isStream) {
+          source.setValue(value);
+        }
+      },
+
+      setSource: function(nextSource) {
+        var prevSource = this.source;
+        if (nextSource !== prevSource) {
+          if (prevSource && prevSource.isStream) {
+            prevSource.unsubscribe(this._didChange, this);
+          }
+
+          if (nextSource && nextSource.isStream) {
+            nextSource.subscribe(this._didChange, this);
+          }
+
+          this.source = nextSource;
+          this.notify();
+        }
+      },
+
+      _didChange: function() {
+        this.notify();
+      },
+
+      destroy: function() {
+        if (this.source && this.source.isStream) {
+          this.source.unsubscribe(this._didChange, this);
+        }
+
+        this.source = undefined;
+        Stream.prototype.destroy.call(this);
+      }
+    });
+
+    __exports__["default"] = SimpleStream;
+  });
+enifed("ember-metal/streams/stream",
+  ["ember-metal/platform","ember-metal/path_cache","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var create = __dependency1__.create;
+    var getFirstKey = __dependency2__.getFirstKey;
+    var getTailPath = __dependency2__.getTailPath;
+
+    var NIL = function NIL(){};
+
+    function Stream(fn) {
+      this.valueFn = fn;
+      this.cache = NIL;
+      this.subscribers = undefined;
+      this.children = undefined;
+      this.destroyed = false;
+    }
+
+    Stream.prototype = {
+      isStream: true,
+
+      cache: NIL,
+
+      get: function(path) {
+        var firstKey = getFirstKey(path);
+        var tailPath = getTailPath(path);
+
+        if (this.children === undefined) {
+          this.children = create(null);
+        }
+
+        var keyStream = this.children[firstKey];
+
+        if (keyStream === undefined) {
+          keyStream = this._makeChildStream(firstKey, path);
+          this.children[firstKey] = keyStream;
+        }
+
+        if (tailPath === undefined) {
+          return keyStream;
+        } else {
+          return keyStream.get(tailPath);
+        }
+      },
+
+      value: function() {
+        if (this.cache !== NIL) {
+          return this.cache;
+        } else {
+          return this.cache = this.valueFn();
+        }
+      },
+
+      setValue: function() {
+        throw new Error("Stream error: setValue not implemented");
+      },
+
+      notify: function() {
+        this.notifyExcept();
+      },
+
+      notifyExcept: function(callbackToSkip, contextToSkip) {
+        if (this.cache !== NIL) {
+          this.cache = NIL;
+          this.notifySubscribers(callbackToSkip, contextToSkip);
+        }
+      },
+
+      subscribe: function(callback, context) {
+        if (this.subscribers === undefined) {
+          this.subscribers = [callback, context];
+        } else {
+          this.subscribers.push(callback, context);
+        }
+      },
+
+      unsubscribe: function(callback, context) {
+        var subscribers = this.subscribers;
+
+        if (subscribers !== undefined) {
+          for (var i = 0, l = subscribers.length; i < l; i += 2) {
+            if (subscribers[i] === callback && subscribers[i+1] === context) {
+              subscribers.splice(i, 2);
+              return;
+            }
+          }
+        }
+      },
+
+      notifySubscribers: function(callbackToSkip, contextToSkip) {
+        var subscribers = this.subscribers;
+
+        if (subscribers !== undefined) {
+          for (var i = 0, l = subscribers.length; i < l; i += 2) {
+            var callback = subscribers[i];
+            var context = subscribers[i+1];
+
+            if (callback === callbackToSkip && context === contextToSkip) {
+              continue;
+            }
+
+            if (context === undefined) {
+              callback(this);
+            } else {
+              callback.call(context, this);
+            }
+          }
+        }
+      },
+
+      destroy: function() {
+        if (this.destroyed) return;
+        this.destroyed = true;
+
+        var children = this.children;
+        for (var key in children) {
+          children[key].destroy();
+        }
+      },
+
+      isGlobal: function() {
+        var stream = this;
+        while (stream !== undefined) {
+          if (stream._isRoot) {
+            return stream._isGlobal;
+          }
+          stream = stream.source;
+        }
+      }
+    };
+
+    __exports__["default"] = Stream;
+  });
+enifed("ember-metal/streams/stream_binding",
+  ["ember-metal/platform","ember-metal/merge","ember-metal/run_loop","ember-metal/streams/stream","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var create = __dependency1__.create;
+    var merge = __dependency2__["default"];
+    var run = __dependency3__["default"];
+    var Stream = __dependency4__["default"];
+
+    function StreamBinding(stream) {
+      
+      this.stream = stream;
+      this.senderCallback = undefined;
+      this.senderContext = undefined;
+      this.senderValue = undefined;
+      this.destroyed = false;
+
+      stream.subscribe(this._onNotify, this);
+    }
+
+    StreamBinding.prototype = create(Stream.prototype);
+
+    merge(StreamBinding.prototype, {
+      valueFn: function() {
+        return this.stream.value();
+      },
+
+      _onNotify: function() {
+        this._scheduleSync(undefined, undefined, this);
+      },
+
+      setValue: function(value, callback, context) {
+        this._scheduleSync(value, callback, context);
+      },
+
+      _scheduleSync: function(value, callback, context) {
+        if (this.senderCallback === undefined && this.senderContext === undefined) {
+          this.senderCallback = callback;
+          this.senderContext = context;
+          this.senderValue = value;
+          run.schedule('sync', this, this._sync);
+        } else if (this.senderContext !== this) {
+          this.senderCallback = callback;
+          this.senderContext = context;
+          this.senderValue = value;
+        }
+      },
+
+      _sync: function() {
+        if (this.destroyed) {
+          return;
+        }
+
+        if (this.senderContext !== this) {
+          this.stream.setValue(this.senderValue);
+        }
+
+        var senderCallback = this.senderCallback;
+        var senderContext = this.senderContext;
+        this.senderCallback = undefined;
+        this.senderContext = undefined;
+        this.senderValue = undefined;
+
+        // Force StreamBindings to always notify
+        this.cache = undefined;
+
+        this.notifyExcept(senderCallback, senderContext);
+      },
+
+      destroy: function() {
+        if (this.destroyed) {
+          return;
+        }
+
+        this.destroyed = true;
+        this.stream.unsubscribe(this._onNotify, this);
+      }
+    });
+
+    __exports__["default"] = StreamBinding;
+  });
 enifed("ember-metal/utils",
   ["ember-metal/core","ember-metal/platform","ember-metal/array","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
@@ -18479,7 +18393,7 @@ enifed("ember-metal/utils",
     var o_defineProperty = __dependency2__.defineProperty;
     var canDefineNonEnumerableProperties = __dependency2__.canDefineNonEnumerableProperties;
     var hasPropertyAccessors = __dependency2__.hasPropertyAccessors;
-    var create = __dependency2__.create;
+    var o_create = __dependency2__.create;
 
     var forEach = __dependency3__.forEach;
 
@@ -18519,7 +18433,6 @@ enifed("ember-metal/utils",
     */
     var GUID_PREFIX = 'ember';
 
-    var o_create = create;
     // Used for guid generation...
     var numberCache  = [];
     var stringCache  = {};
@@ -18697,22 +18610,17 @@ enifed("ember-metal/utils",
       this.cache = {};
       this.cacheMeta = {};
       this.source = obj;
+      this.deps = undefined;
+      this.listeners = undefined;
+      this.mixins = undefined;
+      this.bindings = undefined;
+      this.chains = undefined;
+      this.values = undefined;
+      this.proto = undefined;
     }
 
     Meta.prototype = {
-      descs: null,
-      deps: null,
-      watching: null,
-      listeners: null,
-      cache: null,
-      cacheMeta: null,
-      source: null,
-      mixins: null,
-      bindings: null,
-      chains: null,
-      chainWatchers: null,
-      values: null,
-      proto: null
+      chainWatchers: null
     };
 
     if (!canDefineNonEnumerableProperties) {
@@ -18750,7 +18658,6 @@ enifed("ember-metal/utils",
       @return {Object} the meta hash for an object
     */
     function meta(obj, writable) {
-
       var ret = obj['__ember_meta__'];
       if (writable===false) return ret || EMPTY_META;
 
@@ -18931,8 +18838,8 @@ enifed("ember-metal/utils",
 
     /**
       Forces the passed object to be part of an array. If the object is already
-      an array or array-like, returns the object. Otherwise adds the object to
-      an array. If obj is `null` or `undefined`, returns an empty array.
+      an array or array-like, it will return the object. Otherwise, it will add the object to
+      an array. If obj is `null` or `undefined`, it will return an empty array.
 
       ```javascript
       Ember.makeArray();            // []
@@ -19334,16 +19241,13 @@ enifed("ember-metal/watch_key",
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
-    var meta = __dependency2__.meta;
+    var metaFor = __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 metaFor = meta; // utils.js
-
-
     function watchKey(obj, keyName, meta) {
       // can't watch length on Array - it is special...
       if (keyName === 'length' && typeOf(obj) === 'array') { return; }
@@ -19369,7 +19273,8 @@ enifed("ember-metal/watch_key",
     __exports__.watchKey = watchKey;
     
     function unwatchKey(obj, keyName, meta) {
-      var m = meta || metaFor(obj), watching = m.watching;
+      var m = meta || metaFor(obj);
+      var watching = m.watching;
 
       if (watching[keyName] === 1) {
         watching[keyName] = 0;
@@ -19392,12 +19297,10 @@ enifed("ember-metal/watch_path",
   ["ember-metal/utils","ember-metal/chains","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var meta = __dependency1__.meta;
+    var metaFor = __dependency1__.meta;
     var typeOf = __dependency1__.typeOf;
     var ChainNode = __dependency2__.ChainNode;
 
-    var metaFor = meta;
-
     // get the chains for the current object. If the current object has
     // chains inherited from the proto they will be cloned and reconfigured for
     // the current object.
@@ -19449,10 +19352,7 @@ enifed("ember-metal/watching",
     @module ember-metal
     */
 
-    var meta = __dependency1__.meta;
-    var GUID_KEY = __dependency1__.GUID_KEY;
     var typeOf = __dependency1__.typeOf;
-    var generateGuid = __dependency1__.generateGuid;
     var removeChainWatcher = __dependency2__.removeChainWatcher;
     var flushPendingChains = __dependency2__.flushPendingChains;
     var watchKey = __dependency3__.watchKey;
@@ -19460,7 +19360,6 @@ enifed("ember-metal/watching",
     var watchPath = __dependency4__.watchPath;
     var unwatchPath = __dependency4__.unwatchPath;
 
-    var metaFor = meta; // utils.js
     var isPath = __dependency5__.isPath;
 
     /**
@@ -19507,31 +19406,7 @@ enifed("ember-metal/watching",
       }
     }
 
-    __exports__.unwatch = unwatch;/**
-      Call on an object when you first beget it from another object. This will
-      setup any chained watchers on the object instance as needed. This method is
-      safe to call multiple times.
-
-      @private
-      @method rewatch
-      @for Ember
-      @param obj
-    */
-    function rewatch(obj) {
-      var m = obj['__ember_meta__'], chains = m && m.chains;
-
-      // make sure the object has its own guid.
-      if (GUID_KEY in obj && !obj.hasOwnProperty(GUID_KEY)) {
-        generateGuid(obj);
-      }
-
-      // make sure any chained watchers update.
-      if (chains && chains.value() !== obj) {
-        m.chains = chains.copy(obj);
-      }
-    }
-
-    __exports__.rewatch = rewatch;var NODE_STACK = [];
+    __exports__.unwatch = unwatch;var NODE_STACK = [];
 
     /**
       Tears down the meta on an object so that it can be garbage collected.
@@ -19577,8 +19452,8 @@ enifed("ember-metal/watching",
     __exports__.destroy = destroy;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-handlebars","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__, __exports__) {
     "use strict";
     /**
     Ember Routing Handlebars
@@ -19590,26 +19465,19 @@ enifed("ember-routing-handlebars",
 
     var Ember = __dependency1__["default"];
     var EmberHandlebars = __dependency2__["default"];
-    var Router = __dependency3__["default"];
 
-    var resolvePaths = __dependency4__.resolvePaths;
-    var resolveParams = __dependency4__.resolveParams;
+    var deprecatedLinkToHelper = __dependency3__.deprecatedLinkToHelper;
+    var linkToHelper = __dependency3__.linkToHelper;
+    var LinkView = __dependency3__.LinkView;
+    var queryParamsHelper = __dependency3__.queryParamsHelper;
 
-    var deprecatedLinkToHelper = __dependency5__.deprecatedLinkToHelper;
-    var linkToHelper = __dependency5__.linkToHelper;
-    var LinkView = __dependency5__.LinkView;
-    var queryParamsHelper = __dependency5__.queryParamsHelper;
+    var outletHelper = __dependency4__.outletHelper;
+    var OutletView = __dependency4__.OutletView;
 
-    var outletHelper = __dependency6__.outletHelper;
-    var OutletView = __dependency6__.OutletView;
+    var renderHelper = __dependency5__["default"];
 
-    var renderHelper = __dependency7__["default"];
-
-    var ActionHelper = __dependency8__.ActionHelper;
-    var actionHelper = __dependency8__.actionHelper;
-
-    Router.resolveParams = resolveParams;
-    Router.resolvePaths = resolvePaths;
+    var ActionHelper = __dependency6__.ActionHelper;
+    var actionHelper = __dependency6__.actionHelper;
 
     Ember.LinkView = LinkView;
     EmberHandlebars.ActionHelper = ActionHelper;
@@ -19625,42 +19493,42 @@ enifed("ember-routing-handlebars",
     __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__) {
+  ["ember-metal/core","ember-metal/array","ember-metal/utils","ember-metal/run_loop","ember-views/streams/read","ember-views/system/utils","ember-views/system/action_manager","ember-handlebars","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Handlebars, uuid, FEATURES, assert, deprecate
-    var get = __dependency2__.get;
-    var forEach = __dependency3__.forEach;
-    var uuid = __dependency4__.uuid;
-    var run = __dependency5__["default"];
+    var forEach = __dependency2__.forEach;
+    var uuid = __dependency3__.uuid;
+    var run = __dependency4__["default"];
 
+    var readUnwrappedModel = __dependency5__.readUnwrappedModel;
     var isSimpleClick = __dependency6__.isSimpleClick;
     var ActionManager = __dependency7__["default"];
-    var EmberRouter = __dependency8__["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"];
 
     /**
     @module ember
     @submodule ember-routing
     */
 
-    var SafeString = EmberHandlebars.SafeString;
-    var a_slice = Array.prototype.slice;
+    function actionArgs(parameters, actionName) {
+      var ret, i;
 
-    function args(options, actionName) {
-      var ret = [];
-      if (actionName) { ret.push(actionName); }
+      if (actionName === undefined) {
+        ret = new Array(parameters.length);
+        for (i = 0; i < parameters.length; i++) {
+          ret[i] = readUnwrappedModel(parameters[i]);
+        }
+      } else {
+        ret = new Array(parameters.length + 1);
+        ret[0] = actionName;
+        for (i = 0; i < parameters.length; i++) {
+          ret[i + 1] = readUnwrappedModel(parameters[i]);
+        }
+      }
 
-      var types = options.options.types.slice(1);
-      var data = options.options.data;
-
-      return ret.concat(resolveParams(options.context, options.params, { types: types, data: data }));
+      return ret;
     }
 
     var ActionHelper = {};
@@ -19709,11 +19577,13 @@ enifed("ember-routing-handlebars/helpers/action",
       return isKeyEvent(eventName) && keyCode !== any && keyCode !== event.which.toString();
     }
 
-    ActionHelper.registerAction = function(actionNameOrPath, options, allowedKeys) {
+    ActionHelper.registerAction = function(actionNameOrStream, options, allowedKeys) {
       var actionId = uuid();
+      var eventName = options.eventName;
+      var parameters = options.parameters;
 
       ActionManager.registeredActions[actionId] = {
-        eventName: options.eventName,
+        eventName: eventName,
         handler: function handleRegisteredAction(event) {
           if (!isAllowedEvent(event, allowedKeys)) { return true; }
 
@@ -19725,35 +19595,28 @@ 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.value();
 
           
-          if (target.target) {
-            target = handlebarsGet(target.root, target.target, target.options);
-          } else {
-            target = target.root;
-          }
+          var actionName;
 
-          if (options.boundProperty) {
-            actionName = resolveParams(parameters.context, [actionNameOrPath], { types: ['ID'], data: parameters.options.data })[0];
+          if (actionNameOrStream.isStream) {
+            actionName = actionNameOrStream.value();
 
             if (typeof actionName === 'undefined' || typeof actionName === 'function') {
-                            actionName = actionNameOrPath;
-            }
+              actionName = actionNameOrStream._originalPath;
+                          }
           }
 
           if (!actionName) {
-            actionName = actionNameOrPath;
+            actionName = actionNameOrStream;
           }
 
           run(function runRegisteredAction() {
             if (target.send) {
-              target.send.apply(target, args(parameters, actionName));
+              target.send.apply(target, actionArgs(parameters, actionName));
             } else {
-                            target[actionName].apply(target, args(parameters));
+                            target[actionName].apply(target, actionArgs(parameters));
             }
           });
         }
@@ -19767,7 +19630,6 @@ enifed("ember-routing-handlebars/helpers/action",
     };
 
     /**
-
       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.
@@ -19931,64 +19793,70 @@ 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 length = arguments.length;
+      var options = arguments[length - 1];
+      var view = options.data.view;
       var hash = options.hash;
-      var controller = options.data.keywords.controller;
+      var types = options.types;
 
       // create a hash to pass along to registerAction
-      var action = {
+      var parameters = [];
+
+      var actionOptions = {
         eventName: hash.on || "click",
-        parameters: {
-          context: this,
-          options: options,
-          params: contexts
-        },
+        parameters: parameters,
         view: options.data.view,
         bubbles: hash.bubbles,
         preventDefault: hash.preventDefault,
-        target: { options: options },
-        withKeyCode: hash.withKeyCode,
-        boundProperty: options.types[0] === "ID"
+        target: view.getStream(hash.target || 'controller'),
+        withKeyCode: hash.withKeyCode
       };
 
-      if (hash.target) {
-        action.target.root = this;
-        action.target.target = hash.target;
-      } else if (controller) {
-        action.target.root = controller;
+      var actionNameStream;
+
+      if (types[0] === "ID") {
+        actionNameStream = view.getStream(actionName);
+        actionNameStream._originalPath = actionName;
+      } else {
+        actionNameStream = actionName;
       }
 
-      var actionId = ActionHelper.registerAction(actionName, action, hash.allowedKeys);
-      return new SafeString('data-ember-action="' + actionId + '"');
+      for (var i = 1; i < length - 1; i++) {
+        if (types[i] === "ID") {
+          parameters.push(view.getStream(arguments[i]));
+        } else {
+          parameters.push(arguments[i]);
+        }
+      }
+
+      var actionId = ActionHelper.registerAction(actionNameStream, actionOptions, hash.allowedKeys);
+      return new EmberHandlebars.SafeString('data-ember-action="' + actionId + '"');
     }
 
     __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"],
+  ["ember-metal/core","ember-metal/property_get","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/controller","ember-metal/keys","ember-views/system/utils","ember-views/views/component","ember-handlebars/helpers/view","ember-routing/utils","ember-handlebars/ext","ember-metal/streams/read","ember-handlebars","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"];
     // FEATURES, Logger, Handlebars, warn, assert
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var merge = __dependency4__["default"];
-    var run = __dependency5__["default"];
-    var computed = __dependency6__.computed;
+    var merge = __dependency3__["default"];
+    var run = __dependency4__["default"];
+    var computed = __dependency5__.computed;
+
+    var fmt = __dependency6__.fmt;
+    var EmberObject = __dependency7__["default"];
+    var ControllerMixin = __dependency8__["default"];
+    var keys = __dependency9__["default"];
+    var isSimpleClick = __dependency10__.isSimpleClick;
+    var EmberComponent = __dependency11__["default"];
+    var viewHelper = __dependency12__.viewHelper;
+    var routeArgs = __dependency13__.routeArgs;
+    var stringifyValue = __dependency14__.stringifyValue;
+    var read = __dependency15__.read;
 
-    var onLoad = __dependency7__.onLoad;
-    var fmt = __dependency8__.fmt;
-    var EmberObject = __dependency9__["default"];
-    var keys = __dependency10__["default"];
-    var isSimpleClick = __dependency11__.isSimpleClick;
-    var EmberComponent = __dependency12__["default"];
-    var EmberHandlebars = __dependency13__["default"];
-    var viewHelper = __dependency14__.viewHelper;
-    var EmberRouter = __dependency15__["default"];
-    var resolveParams = __dependency16__.resolveParams;
-    var resolvePaths = __dependency16__.resolvePaths;
-    var routeArgs = __dependency16__.routeArgs;
 
     /**
     @module ember
@@ -19997,8 +19865,6 @@ enifed("ember-routing-handlebars/helpers/link_to",
 
     var slice = [].slice;
 
-    requireModule('ember-handlebars');
-
     var numberOfContextsAcceptedByHandler = function(handler, handlerInfos) {
       var req = 0;
       for (var i = 0, l = handlerInfos.length; i < l; i++) {
@@ -20014,14 +19880,6 @@ enifed("ember-routing-handlebars/helpers/link_to",
       values: null
     });
 
-    function getResolvedPaths(options) {
-
-      var types = options.options.types;
-      var data = options.options.data;
-
-      return resolvePaths(options.context, options.params, { types: types, data: data });
-    }
-
     /**
       `Ember.LinkView` renders an element whose `click` event triggers a
       transition of the application's instance of `Ember.Router` to
@@ -20207,40 +20065,33 @@ 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 params = this.params;
 
-        if (linkTextPath) {
-          normalizedPath = getNormalizedPath(linkTextPath, helperParameters);
-          this.registerObserver(normalizedPath.root, normalizedPath.path, this, this.rerender);
+        var scheduledRerender = this._wrapAsScheduled(this.rerender);
+        var scheduledParamsChanged = this._wrapAsScheduled(this._paramsChanged);
+
+        if (this.linkTitle) {
+          this.linkTitle.subscribe(scheduledRerender, this);
         }
 
-        for(i=0; i < length; i++) {
-          path = paths[i];
-          if (null === path) {
-            // A literal value was provided, not a path, so nothing to observe.
-            continue;
+        for (var i = 0; i < params.length; i++) {
+          var param = params[i];
+          if (param && param.isStream) {
+            param.subscribe(scheduledParamsChanged, this);
           }
-
-          normalizedPath = getNormalizedPath(path, helperParameters);
-          this.registerObserver(normalizedPath.root, normalizedPath.path, this, this._paramsChanged);
         }
 
         var queryParamsObject = this.queryParamsObject;
         if (queryParamsObject) {
           var values = queryParamsObject.values;
-
-          // Install observers for all of the hash options
-          // provided in the (query-params) subexpression.
           for (var k in values) {
-            if (!values.hasOwnProperty(k)) { continue; }
+            if (!values.hasOwnProperty(k)) {
+              continue;
+            }
 
-            if (queryParamsObject.types[k] === 'ID') {
-              normalizedPath = getNormalizedPath(values[k], helperParameters);
-              this.registerObserver(normalizedPath.root, normalizedPath.path, this, this._paramsChanged);
+            var value = values[k];
+            if (value && value.isStream) {
+              value.subscribe(scheduledParamsChanged, this);
             }
           }
         }
@@ -20463,20 +20314,20 @@ 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 params = this.params;
+        var targetRouteName;
+        var models = [];
+        var onlyQueryParamsSupplied = (params.length === 0);
 
         if (onlyQueryParamsSupplied) {
           var appController = this.container.lookup('controller:application');
           targetRouteName = get(appController, 'currentRouteName');
-          models = [];
         } else {
-          models = resolveParams(parameters.context, parameters.params, { types: types, data: data });
-          targetRouteName = models.shift();
+          targetRouteName = read(params[0]);
+
+          for (var i = 1; i < params.length; i++) {
+            models.push(read(params[i]));
+          }
         }
 
         var suppliedQueryParams = getResolvedQueryParams(this, targetRouteName);
@@ -20835,23 +20686,32 @@ enifed("ember-routing-handlebars/helpers/link_to",
     function linkToHelper(name) {
       var options = slice.call(arguments, -1)[0];
       var params = slice.call(arguments, 0, -1);
+      var view = options.data.view;
       var hash = options.hash;
+      var hashTypes = options.hashTypes;
+      var types = options.types;
+      var shouldEscape = !hash.unescaped;
+      var queryParamsObject;
 
       
       if (params[params.length - 1] instanceof QueryParams) {
-        hash.queryParamsObject = params.pop();
+        hash.queryParamsObject = queryParamsObject = params.pop();
       }
 
-      hash.disabledBinding = hash.disabledWhen;
+      if (hash.disabledWhen) {
+        hash.disabledBinding = hash.disabledWhen;
+        hashTypes.disabledBinding = hashTypes.disabledWhen;
+        delete hash.disabledWhen;
+        delete hashTypes.disabledWhen;
+      }
 
       if (!options.fn) {
         var linkTitle = params.shift();
-        var linkType = options.types.shift();
-        var context = this;
-        if (linkType === 'ID') {
-          options.linkTextPath = linkTitle;
+        var linkTitleType = types.shift();
+        if (linkTitleType === 'ID') {
+          hash.linkTitle = linkTitle = view.getStream(linkTitle);
           options.fn = function() {
-            return EmberHandlebars.getEscaped(context, linkTitle, options);
+            return stringifyValue(linkTitle.value(), shouldEscape);
           };
         } else {
           options.fn = function() {
@@ -20860,11 +20720,24 @@ enifed("ember-routing-handlebars/helpers/link_to",
         }
       }
 
-      hash.parameters = {
-        context: this,
-        options: options,
-        params: params
-      };
+      // Setup route & param streams
+      for (var i = 0; i < params.length; i++) {
+        var paramPath = params[i];
+        if (types[i] === 'ID') {
+          var lazyValue = view.getStream(paramPath);
+
+          // TODO: Consider a better approach to unwrapping controllers.
+          if (paramPath !== 'controller') {
+            while (ControllerMixin.detect(lazyValue.value())) {
+              paramPath = (paramPath === '') ? 'model' : paramPath + '.model';
+              lazyValue = view.getStream(paramPath);
+            }
+          }
+          params[i] = lazyValue;
+        }
+      }
+
+      hash.params = params;
 
       options.helperName = options.helperName || 'link-to';
 
@@ -20872,6 +20745,13 @@ enifed("ember-routing-handlebars/helpers/link_to",
     }
 
     /**
+      This is a sub-expression to be used in conjunction with the link-to helper.
+      It will supply url query parameters to the target route.
+
+      Example
+
+      {#link-to 'posts' (query-params direction="asc")}}Sort{{/link-to}}
+
       @method query-params
       @for Ember.Handlebars.helpers
       @param {Object} hash takes a hash of query parameters
@@ -20879,9 +20759,18 @@ enifed("ember-routing-handlebars/helpers/link_to",
     */
     function queryParamsHelper(options) {
       
+      var view = options.data.view;
+      var hash = options.hash;
+      var hashTypes = options.hashTypes;
+
+      for (var k in hash) {
+        if (hashTypes[k] === 'ID') {
+          hash[k] = view.getStream(hash[k]);
+        }
+      }
+
       return QueryParams.create({
-        values: options.hash,
-        types: options.hashTypes
+        values: options.hash
       });
     }
 
@@ -20896,34 +20785,23 @@ enifed("ember-routing-handlebars/helpers/link_to",
       @return {String} HTML string
     */
     function deprecatedLinkToHelper() {
-            return linkToHelper.apply(this, arguments);
+      
+      return linkToHelper.apply(this, arguments);
     }
 
     function getResolvedQueryParams(linkView, targetRouteName) {
-      var helperParameters = linkView.parameters;
       var queryParamsObject = linkView.queryParamsObject;
       var resolvedQueryParams = {};
 
       if (!queryParamsObject) { return resolvedQueryParams; }
-      var rawParams = queryParamsObject.values;
 
-      for (var key in rawParams) {
-        if (!rawParams.hasOwnProperty(key)) { continue; }
-
-        var value = rawParams[key];
-        var type = queryParamsObject.types[key];
-
-        if (type === 'ID') {
-          var normalizedPath = getNormalizedPath(value, helperParameters);
-          value = EmberHandlebars.get(normalizedPath.root, normalizedPath.path, helperParameters.options);
-        }
-        resolvedQueryParams[key] = value;
+      var values = queryParamsObject.values;
+      for (var key in values) {
+        if (!values.hasOwnProperty(key)) { continue; }
+        resolvedQueryParams[key] = read(values[key]);
       }
-      return resolvedQueryParams;
-    }
 
-    function getNormalizedPath(path, helperParameters) {
-      return EmberHandlebars.normalizePath(helperParameters.context, path, helperParameters.options.data);
+      return resolvedQueryParams;
     }
 
     function paramsAreLoaded(params) {
@@ -20952,17 +20830,15 @@ enifed("ember-routing-handlebars/helpers/link_to",
     __exports__.linkToHelper = linkToHelper;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/property_set","ember-views/views/container_view","ember-handlebars/views/metamorph_view","ember-handlebars/helpers/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // assert
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var onLoad = __dependency4__.onLoad;
-    var ContainerView = __dependency5__["default"];
-    var _Metamorph = __dependency6__._Metamorph;
-    var viewHelper = __dependency7__.viewHelper;
+    var set = __dependency2__.set;
+    var ContainerView = __dependency3__["default"];
+    var _Metamorph = __dependency4__._Metamorph;
+    var viewHelper = __dependency5__.viewHelper;
 
     /**
     @module ember
@@ -21041,7 +20917,6 @@ enifed("ember-routing-handlebars/helpers/outlet",
     */
     function outletHelper(property, options) {
       var outletSource;
-      var container;
       var viewName;
       var viewClass;
       var viewFullName;
@@ -21051,12 +20926,15 @@ enifed("ember-routing-handlebars/helpers/outlet",
         property = 'main';
       }
 
-      container = options.data.view.container;
+      
+      var view = options.data.view;
+      var container = view.container;
 
-      outletSource = options.data.view;
+      outletSource = view;
       while (!outletSource.get('template.isTop')) {
         outletSource = outletSource.get('_parentView');
       }
+      set(view, 'outletSource', outletSource);
 
       // provide controller override
       viewName = options.hash.view;
@@ -21066,9 +20944,10 @@ enifed("ember-routing-handlebars/helpers/outlet",
                       }
 
       viewClass = viewName ? container.lookupFactory(viewFullName) : options.hash.viewClass || OutletView;
+      options.types = [ 'ID' ];
 
-      options.data.view.set('outletSource', outletSource);
       options.hash.currentViewBinding = '_view.outletSource._outlets.' + property;
+      options.hashTypes.currentViewBinding = 'STRING';
 
       options.helperName = options.helperName || 'outlet';
 
@@ -21078,20 +20957,16 @@ enifed("ember-routing-handlebars/helpers/outlet",
     __exports__.outletHelper = outletHelper;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/error","ember-runtime/system/string","ember-routing/system/generate_controller","ember-handlebars/helpers/view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // assert, deprecate
     var EmberError = __dependency2__["default"];
-    var get = __dependency3__.get;
-    var set = __dependency4__.set;
-    var camelize = __dependency5__.camelize;
-    var generateControllerFactory = __dependency6__.generateControllerFactory;
-    var generateController = __dependency6__["default"];
-    var handlebarsGet = __dependency7__.handlebarsGet;
-    var ViewHelper = __dependency8__.ViewHelper;
-
+    var camelize = __dependency3__.camelize;
+    var generateControllerFactory = __dependency4__.generateControllerFactory;
+    var generateController = __dependency4__["default"];
+    var ViewHelper = __dependency5__.ViewHelper;
 
     /**
     @module ember
@@ -21122,7 +20997,7 @@ enifed("ember-routing-handlebars/helpers/render",
       Hello, {{who}}.
       ```
 
-      ```handelbars
+      ```handlebars
       <!-- application.hbs -->
       <h1>My great app</h1>
       {{render "navigation"}}
@@ -21170,10 +21045,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 container, router, controller, view, initialContext;
 
-      container = (options || contextString).data.keywords.controller.container;
+      container = (options || contextString).data.view._keywords.controller.value().container;
       router = container.lookup('router:main');
 
       if (length === 2) {
@@ -21182,7 +21056,7 @@ enifed("ember-routing-handlebars/helpers/render",
         contextString = undefined;
               } else if (length === 3) {
         // create a new controller
-        context = handlebarsGet(options.contexts[1], contextString, options);
+        initialContext = options.data.view.getStream(contextString).value();
       } else {
         throw new EmberError("You must pass a templateName to render");
       }
@@ -21202,15 +21076,15 @@ enifed("ember-routing-handlebars/helpers/render",
       if (options.hash.controller) {
               }
 
-      var parentController = options.data.keywords.controller;
+      var parentController = options.data.view._keywords.controller.value();
 
       // choose name
       if (length > 2) {
         var factory = container.lookupFactory(controllerFullName) ||
-                      generateControllerFactory(container, controllerName, context);
+                      generateControllerFactory(container, controllerName, initialContext);
 
         controller = factory.create({
-          model: context,
+          modelBinding: options.data.view._getBindingForStream(contextString),
           parentController: parentController,
           target: parentController
         });
@@ -21228,14 +21102,6 @@ enifed("ember-routing-handlebars/helpers/render",
         });
       }
 
-      var root = options.contexts[1];
-
-      if (root) {
-        view.registerObserver(root, contextString, function() {
-          controller.set('model', handlebarsGet(root, contextString, options));
-        });
-      }
-
       options.hash.viewName = camelize(name);
 
       var templateName = 'template:' + name;
@@ -21243,7 +21109,7 @@ enifed("ember-routing-handlebars/helpers/render",
 
       options.hash.controller = controller;
 
-      if (router && !context) {
+      if (router && !initialContext) {
         router._connectActiveView(name, view);
       }
 
@@ -21252,102 +21118,9 @@ enifed("ember-routing-handlebars/helpers/render",
       ViewHelper.instanceHelper(this, view, options);
     }
   });
-enifed("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";
-    var get = __dependency1__.get;
-    var map = __dependency2__.map;
-    var ControllerMixin = __dependency3__["default"];
-    var handlebarsResolve = __dependency4__.resolveParams;
-    var handlebarsGet = __dependency4__.handlebarsGet;
-    var typeOf = __dependency5__.typeOf;
-    var get = __dependency1__.get;
-
-    function routeArgs(targetRouteName, models, queryParams) {
-      var args = [];
-      if (typeOf(targetRouteName) === 'string') {
-        args.push('' + targetRouteName);
-      }
-      args.push.apply(args, models);
-      args.push({ queryParams: queryParams });
-      return args;
-    }
-
-    __exports__.routeArgs = routeArgs;function getActiveTargetName(router) {
-      var handlerInfos = router.activeTransition ?
-                         router.activeTransition.state.handlerInfos :
-                         router.state.handlerInfos;
-      return handlerInfos[handlerInfos.length - 1].name;
-    }
-
-    __exports__.getActiveTargetName = getActiveTargetName;function resolveParams(context, params, options) {
-      return map.call(resolvePaths(context, params, options), function(path, i) {
-        if (null === path) {
-          // Param was string/number, not a path, so just return raw string/number.
-          return params[i];
-        } else {
-          return handlebarsGet(context, path, options);
-        }
-      });
-    }
-
-    __exports__.resolveParams = resolveParams;function stashParamNames(router, handlerInfos) {
-      if (handlerInfos._namesStashed) { return; }
-
-      // This helper exists because router.js/route-recognizer.js awkwardly
-      // keeps separate a handlerInfo's list of parameter names depending
-      // on whether a URL transition or named transition is happening.
-      // Hopefully we can remove this in the future.
-      var targetRouteName = handlerInfos[handlerInfos.length-1].name;
-      var recogHandlers = router.router.recognizer.handlersFor(targetRouteName);
-      var dynamicParent = null;
-
-      for (var i = 0, len = handlerInfos.length; i < len; ++i) {
-        var handlerInfo = handlerInfos[i];
-        var names = recogHandlers[i].names;
-
-        if (names.length) {
-          dynamicParent = handlerInfo;
-        }
-
-        handlerInfo._names = names;
-
-        var route = handlerInfo.handler;
-        route._stashNames(handlerInfo, dynamicParent);
-      }
-
-      handlerInfos._namesStashed = true;
-    }
-
-    __exports__.stashParamNames = stashParamNames;function resolvePaths(context, params, options) {
-      var resolved = handlebarsResolve(context, params, options);
-      var types = options.types;
-
-      return map.call(resolved, function(object, i) {
-        if (types[i] === 'ID') {
-          return unwrap(object, params[i]);
-        } else {
-          return null;
-        }
-      });
-
-      function unwrap(object, path) {
-        if (path === 'controller') { return path; }
-
-        if (ControllerMixin.detect(object)) {
-          return unwrap(get(object, 'model'), path ? path + '.model' : 'model');
-        } else {
-          return path;
-        }
-      }
-    }
-
-    __exports__.resolvePaths = resolvePaths;
-  });
 enifed("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__) {
+  ["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__, __exports__) {
     "use strict";
     /**
     Ember Routing
@@ -21357,23 +21130,22 @@ enifed("ember-routing",
     @requires ember-views
     */
 
-    var EmberHandlebars = __dependency1__["default"];
-    var Ember = __dependency2__["default"];
+    var Ember = __dependency1__["default"];
 
     // ES6TODO: Cleanup modules with side-effects below
 
-    var EmberLocation = __dependency6__["default"];
-    var NoneLocation = __dependency7__["default"];
-    var HashLocation = __dependency8__["default"];
-    var HistoryLocation = __dependency9__["default"];
-    var AutoLocation = __dependency10__["default"];
+    var EmberLocation = __dependency5__["default"];
+    var NoneLocation = __dependency6__["default"];
+    var HashLocation = __dependency7__["default"];
+    var HistoryLocation = __dependency8__["default"];
+    var AutoLocation = __dependency9__["default"];
 
-    var generateControllerFactory = __dependency11__.generateControllerFactory;
-    var generateController = __dependency11__["default"];
-    var controllerFor = __dependency12__["default"];
-    var RouterDSL = __dependency13__["default"];
-    var Router = __dependency14__["default"];
-    var Route = __dependency15__["default"];
+    var generateControllerFactory = __dependency10__.generateControllerFactory;
+    var generateController = __dependency10__["default"];
+    var controllerFor = __dependency11__["default"];
+    var RouterDSL = __dependency12__["default"];
+    var Router = __dependency13__["default"];
+    var Route = __dependency14__["default"];
 
     Ember.Location = EmberLocation;
     Ember.AutoLocation = AutoLocation;
@@ -21391,8 +21163,8 @@ enifed("ember-routing",
     __exports__["default"] = Ember;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/utils","ember-metal/merge","ember-runtime/mixins/controller","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // FEATURES, deprecate
@@ -21402,9 +21174,8 @@ enifed("ember-routing/ext/controller",
     var typeOf = __dependency5__.typeOf;
     var meta = __dependency5__.meta;
     var merge = __dependency6__["default"];
-    var map = __dependency7__.map;
 
-    var ControllerMixin = __dependency8__["default"];
+    var ControllerMixin = __dependency7__["default"];
 
     /**
     @module ember
@@ -21420,6 +21191,11 @@ enifed("ember-routing/ext/controller",
       },
 
       /**
+        Defines which query parameters the controller accepts.
+        If you give the names ['category','page'] it will bind
+        the values of these query parameters to the variables
+        `this.category` and `this.page`
+
         @property queryParams
         @public
       */
@@ -21744,8 +21520,6 @@ enifed("ember-routing/ext/run_loop",
     // resolve), which is used in router transitions to prevent unnecessary
     // loading state entry if all context promises resolve on the
     // 'actions' queue first.
-
-    var queues = run.queues;
     run._addQueue('routerTransitions', 'actions');
   });
 enifed("ember-routing/ext/view",
@@ -21770,7 +21544,7 @@ enifed("ember-routing/ext/view",
         @method init
        */
       init: function() {
-        set(this, '_outlets', {});
+        this._outlets = {};
         this._super();
       },
 
@@ -21906,13 +21680,11 @@ enifed("ember-routing/ext/view",
     __exports__["default"] = EmberView;
   });
 enifed("ember-routing/location/api",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/core","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // deprecate, assert
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
 
     /**
     @module ember
@@ -22115,18 +21887,17 @@ enifed("ember-routing/location/api",
     };
   });
 enifed("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__) {
+  ["ember-metal/core","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__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // FEATURES
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
+    var set = __dependency2__.set;
 
-    var EmberLocation = __dependency4__["default"];
-    var HistoryLocation = __dependency5__["default"];
-    var HashLocation = __dependency6__["default"];
-    var NoneLocation = __dependency7__["default"];
+    var EmberLocation = __dependency3__["default"];
+    var HistoryLocation = __dependency4__["default"];
+    var HashLocation = __dependency5__["default"];
+    var NoneLocation = __dependency6__["default"];
 
     /**
     @module ember
@@ -22551,14 +22322,33 @@ enifed("ember-routing/location/hash_location",
       getHash: EmberLocation._getHash,
 
       /**
-        Returns the current `location.hash`, minus the '#' at the front.
+        Returns the normalized URL, constructed from `location.hash`.
+
+        e.g. `#/foo` => `/foo` as well as `#/foo#bar` => `/foo#bar`.
+
+        By convention, hashed paths must begin with a forward slash, otherwise they
+        are not treated as a path so we can distinguish intent.
 
         @private
         @method getURL
       */
       getURL: function() {
-        var path = this.getHash().substr(1);
-                return path;
+        var originalPath = this.getHash().substr(1);
+        var outPath = originalPath;
+        
+        if (outPath.charAt(0) !== '/') {
+          outPath = '/';
+
+          // Only add the # if the path isn't empty.
+          // We do NOT want `/#` since the ampersand
+          // is only included (conventionally) when
+          // the location.hash has a value
+          if (originalPath) {
+            outPath += '#' + originalPath;
+          }
+        }
+
+        return outPath;
       },
 
       /**
@@ -22642,16 +22432,15 @@ enifed("ember-routing/location/hash_location",
     });
   });
 enifed("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"],
+  ["ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/object","ember-routing/location/api","ember-views/system/jquery","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    // FEATURES
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var guidFor = __dependency4__.guidFor;
+    var get = __dependency1__.get;
+    var set = __dependency2__.set;
+    var guidFor = __dependency3__.guidFor;
 
-    var EmberObject = __dependency5__["default"];
+    var EmberObject = __dependency4__["default"];
+    var EmberLocation = __dependency5__["default"];
     var jQuery = __dependency6__["default"];
 
     /**
@@ -22717,6 +22506,7 @@ enifed("ember-routing/location/history_location",
         var search = location.search || '';
 
         url += search;
+        url += this.getHash();
 
         return url;
       },
@@ -22798,7 +22588,6 @@ enifed("ember-routing/location/history_location",
       */
       replaceState: function(path) {
         var state = { path: path };
-
         get(this, 'history').replaceState(state, null, path);
 
         // store state if browser doesn't support `history.state`
@@ -22864,7 +22653,16 @@ enifed("ember-routing/location/history_location",
         var guid = guidFor(this);
 
         jQuery(window).off('popstate.ember-location-'+guid);
-      }
+      },
+
+      /**
+        @private
+
+        Returns normalized location.hash
+
+        @method getHash
+      */
+      getHash: EmberLocation._getHash
     });
   });
 enifed("ember-routing/location/none_location",
@@ -23049,28 +22847,20 @@ enifed("ember-routing/system/dsl",
 
         var type = options.resetNamespace === true ? 'resource' : 'route';
         
-
-        if (typeof options.path !== 'string') {
-          options.path = "/" + name;
-        }
-
-        if (canNest(this) && options.resetNamespace !== true) {
-          name = this.parent + "." + name;
-        }
-
+        
         if (callback) {
-          var dsl = new DSL(name);
-          route(dsl, 'loading');
-          route(dsl, 'error', { path: "/_unused_dummy_error_path_route_" + name + "/:error" });
+          var fullName = getFullName(this, name, options.resetNamespace);
+          var dsl = new DSL(fullName);
+          createRoute(dsl, 'loading');
+          createRoute(dsl, 'error', { path: "/_unused_dummy_error_path_route_" + name + "/:error" });
 
-          if (callback) { callback.call(dsl); }
+          callback.call(dsl);
 
-          this.push(options.path, name, dsl.generate());
+          createRoute(this, name, options, dsl.generate());
         } else {
-          this.push(options.path, name, null);
+          createRoute(this, name, options);
         }
-
-              },
+      },
 
       push: function(url, name, callback) {
         var parts = name.split('.');
@@ -23097,13 +22887,13 @@ enifed("ember-routing/system/dsl",
         var dslMatches = this.matches;
 
         if (!this.explicitIndex) {
-          route(this, "index", { path: "/" });
+          this.route("index", { path: "/" });
         }
 
         return function(match) {
           for (var i=0, l=dslMatches.length; i<l; i++) {
             var dslMatch = dslMatches[i];
-            var matchObj = match(dslMatch[0]).to(dslMatch[1], dslMatch[2]);
+            match(dslMatch[0]).to(dslMatch[1], dslMatch[2]);
           }
         };
       }
@@ -23113,19 +22903,24 @@ enifed("ember-routing/system/dsl",
       return dsl.parent && dsl.parent !== 'application';
     }
 
-    function route(dsl, name, options) {
-      
+    function getFullName(dsl, name, resetNamespace) {
+      if (canNest(dsl) && resetNamespace !== true) {
+        return dsl.parent + "." + name;
+      } else {
+        return name;
+      }
+    }
+
+    function createRoute(dsl, name, options, callback) {
       options = options || {};
 
+      var fullName = getFullName(dsl, name, options.resetNamespace);
+
       if (typeof options.path !== 'string') {
         options.path = "/" + name;
       }
 
-      if (canNest(dsl) && options.resetNamespace !== true) {
-        name = dsl.parent + "." + name;
-      }
-
-      dsl.push(options.path, name, null);
+      dsl.push(options.path, fullName, callback);
     }
 
     DSL.map = function(callback) {
@@ -23165,7 +22960,7 @@ enifed("ember-routing/system/generate_controller",
     */
 
     function generateControllerFactory(container, controllerName, context) {
-      var Factory, fullName, instance, name, factoryName, controllerType;
+      var Factory, fullName, factoryName, controllerType;
 
       if (context && isArray(context)) {
         controllerType = 'array';
@@ -23216,8 +23011,8 @@ enifed("ember-routing/system/generate_controller",
     }
   });
 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"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
+  ["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/evented","ember-runtime/mixins/action_handler","ember-routing/system/generate_controller","ember-routing/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // FEATURES, K, A, deprecate, assert, Logger
@@ -23227,7 +23022,7 @@ enifed("ember-routing/system/route",
     var getProperties = __dependency5__["default"];
     var forEach = __dependency6__.forEach;
     var replace = __dependency6__.replace;
-    var isNone = __dependency7__.isNone;
+    var isNone = __dependency7__["default"];
     var computed = __dependency8__.computed;
     var merge = __dependency9__["default"];
     var isArray = __dependency10__.isArray;
@@ -23236,11 +23031,13 @@ enifed("ember-routing/system/route",
     var keys = __dependency12__["default"];
     var copy = __dependency13__["default"];
     var classify = __dependency14__.classify;
-    var fmt = __dependency14__.fmt;
     var EmberObject = __dependency15__["default"];
-    var ActionHandler = __dependency16__["default"];
-    var generateController = __dependency17__["default"];
-    var stashParamNames = __dependency18__.stashParamNames;
+    var Evented = __dependency16__["default"];
+    var ActionHandler = __dependency17__["default"];
+    var generateController = __dependency18__["default"];
+    var stashParamNames = __dependency19__.stashParamNames;
+
+    var slice = Array.prototype.slice;
 
     /**
     @module ember
@@ -23262,7 +23059,7 @@ enifed("ember-routing/system/route",
         configuration options and their defaults are as follows
         (assuming a query param whose URL key is `page`):
 
-        ```js
+        ```javascript
         queryParams: {
           page: {
             // By default, controller query param properties don't
@@ -23439,7 +23236,12 @@ enifed("ember-routing/system/route",
       mergedProperties: ['events', 'queryParams'],
 
       /**
+        Retrieves parameters, for current route using the state.params
+        variable and getQueryParamsFor, using the supplied routeName.
+
         @method paramsFor
+        @param {String} routename
+
       */
       paramsFor: function(name) {
         var route = this.container.lookup('route:' + name);
@@ -23459,14 +23261,22 @@ enifed("ember-routing/system/route",
       },
 
       /**
+        Serializes the query parameter key
+
         @method serializeQueryParamKey
+        @param {String} controllerPropertyName
       */
       serializeQueryParamKey: function(controllerPropertyName) {
         return controllerPropertyName;
       },
 
       /**
+        Serializes value of the query parameter based on defaultValueType
+
         @method serializeQueryParam
+        @param {Object} value
+        @param {String} urlKey
+        @param {String} defaultValueType
       */
       serializeQueryParam: function(value, urlKey, defaultValueType) {
         // urlKey isn't used here, but anyone overriding
@@ -23479,7 +23289,12 @@ enifed("ember-routing/system/route",
       },
 
       /**
+        Deserializes value of the query parameter based on defaultValueType
+
         @method deserializeQueryParam
+        @param {Object} value
+        @param {String} urlKey
+        @param {String} defaultValueType
       */
       deserializeQueryParam: function(value, urlKey, defaultValueType) {
         // urlKey isn't used here, but anyone overriding
@@ -23508,11 +23323,20 @@ enifed("ember-routing/system/route",
         this.router._queuedQPChanges = {};
       },
 
+      /**
+        @private
+
+        @property _optionsForQueryParam
+      */
+      _optionsForQueryParam: function(qp) {
+        return get(this, 'queryParams.' + qp.urlKey) || get(this, 'queryParams.' + qp.prop) || {};
+      },
+
       /**
         A hook you can use to reset controller values either when the model
         changes or the route is exiting.
 
-        ```js
+        ```javascript
         App.ArticlesRoute = Ember.Route.extend({
           // ...
 
@@ -23539,6 +23363,9 @@ enifed("ember-routing/system/route",
       */
       exit: function() {
         this.deactivate();
+        
+          this.trigger('deactivate');
+        
         this.teardownViews();
       },
 
@@ -23563,6 +23390,9 @@ enifed("ember-routing/system/route",
       */
       enter: function() {
         this.activate();
+        
+          this.trigger('activate');
+        
       },
 
       /**
@@ -23576,7 +23406,7 @@ enifed("ember-routing/system/route",
         because it doesn't require a custom `renderTemplate` method. For example,
         the following routes will all render using the `App.PostsListView` view:
 
-        ```js
+        ```javascript
         var PostsList = Ember.Route.extend({
           viewName: 'postsList'
         });
@@ -23599,7 +23429,7 @@ enifed("ember-routing/system/route",
         This is similar with `viewName`, but is useful when you just want a custom
         template without a view.
 
-        ```js
+        ```javascript
         var PostsList = Ember.Route.extend({
           templateName: 'posts/list'
         });
@@ -23645,7 +23475,7 @@ enifed("ember-routing/system/route",
         A good example is preventing navigation when a form is
         half-filled out:
 
-        ```js
+        ```javascript
         App.ContactFormRoute = Ember.Route.extend({
           actions: {
             willTransition: function(transition) {
@@ -23679,7 +23509,7 @@ enifed("ember-routing/system/route",
         however, it can be useful for tracking page views or resetting
         state on the controller.
 
-        ```js
+        ```javascript
         App.LoginRoute = Ember.Route.extend({
           actions: {
             didTransition: function() {
@@ -23700,7 +23530,7 @@ enifed("ember-routing/system/route",
         `Transition` object is the first parameter and the route that
         triggered the loading event is the second parameter.
 
-        ```js
+        ```javascript
         App.ApplicationRoute = Ember.Route.extend({
           actions: {
             loading: function(transition, route) {
@@ -23709,9 +23539,10 @@ enifed("ember-routing/system/route",
               })
               .append();
 
-              this.router.one('didTransition', function () {
+              this.router.one('didTransition', function() {
                 view.destroy();
               });
+
               return true; // Bubble the loading event
             }
           }
@@ -23735,10 +23566,10 @@ enifed("ember-routing/system/route",
         for rejected promises from the various hooks on the route,
         as well as any unhandled errors from child routes:
 
-        ```js
+        ```javascript
         App.AdminRoute = Ember.Route.extend({
           beforeModel: function() {
-            return Ember.RSVP.reject("bad things!");
+            return Ember.RSVP.reject('bad things!');
           },
 
           actions: {
@@ -23764,7 +23595,7 @@ enifed("ember-routing/system/route",
         specify your own global default error handler by overriding the
         `error` handler on `ApplicationRoute`:
 
-        ```js
+        ```javascript
         App.ApplicationRoute = Ember.Route.extend({
           actions: {
             error: function(error, transition) {
@@ -23788,7 +23619,7 @@ enifed("ember-routing/system/route",
           actions: {
             willTransition: function(transition) {
               if (this.controller.get('userHasEnteredData') &&
-                  !confirm("Are you sure you want to abandon progress?")) {
+                  !confirm('Are you sure you want to abandon progress?')) {
                 transition.abort();
               } else {
                 // Bubble the `willTransition` action so that
@@ -23808,11 +23639,12 @@ enifed("ember-routing/system/route",
       _actions: {
 
         queryParamsDidChange: function(changed, totalPresent, removed) {
+          var qpMap = this.get('_qp').map;
+
           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')) {
+            var qp = qpMap[totalChanged[i]];
+            if (qp && get(this._optionsForQueryParam(qp), 'refreshModel')) {
               this.refresh();
             }
           }
@@ -23863,9 +23695,8 @@ enifed("ember-routing/system/route",
 
             var thisQueryParamChanged = (svalue !== qp.svalue);
             if (thisQueryParamChanged) {
-              var options = get(route, 'queryParams.' + qp.urlKey) || {};
-
               if (transition.queryParamsOnly && replaceUrl !== false) {
+                var options = route._optionsForQueryParam(qp);
                 var replaceConfigValue = get(options, 'replace');
                 if (replaceConfigValue) {
                   replaceUrl = true;
@@ -23959,8 +23790,8 @@ enifed("ember-routing/system/route",
 
         ```javascript
         App.Router.map(function() {
-          this.resource('blogPost', {path:':blogPostId'}, function(){
-            this.resource('blogComment', {path: ':blogCommentId'});
+          this.resource('blogPost', { path:':blogPostId' }, function() {
+            this.resource('blogComment', { path: ':blogCommentId' });
           });
         });
 
@@ -23983,18 +23814,19 @@ enifed("ember-routing/system/route",
 
         ```javascript
         App.Router.map(function() {
-          this.route("index");
-          this.route("secret");
-          this.route("fourOhFour", { path: "*:"});
+          this.route('index');
+          this.route('secret');
+          this.route('fourOhFour', { path: '*:' });
         });
 
         App.IndexRoute = Ember.Route.extend({
           actions: {
-            moveToSecret: function(context){
-              if (authorized()){
+            moveToSecret: function(context) {
+              if (authorized()) {
                 this.transitionTo('secret', context);
-              }
+              } else {
                 this.transitionTo('fourOhFour');
+              }
             }
           }
         });
@@ -24022,17 +23854,18 @@ enifed("ember-routing/system/route",
 
         ```javascript
         App.Router.map(function() {
-          this.route("index");
-          this.resource('breakfast', {path:':breakfastId'}, function(){
-            this.resource('cereal', {path: ':cerealId'});
+          this.route('index');
+
+          this.resource('breakfast', { path: ':breakfastId' }, function() {
+            this.resource('cereal', { path: ':cerealId' });
           });
         });
 
         App.IndexRoute = Ember.Route.extend({
           actions: {
-            moveToChocolateCereal: function(){
-              var cereal = { cerealId: "ChocolateYumminess"},
-                  breakfast = {breakfastId: "CerealAndMilk"};
+            moveToChocolateCereal: function() {
+              var cereal = { cerealId: 'ChocolateYumminess' };
+              var breakfast = { breakfastId: 'CerealAndMilk' };
 
               this.transitionTo('cereal', breakfast, cereal);
             }
@@ -24108,8 +23941,8 @@ enifed("ember-routing/system/route",
 
         ```javascript
         App.Router.map(function() {
-          this.route("index");
-          this.route("secret");
+          this.route('index');
+          this.route('secret');
         });
 
         App.SecretRoute = Ember.Route.extend({
@@ -24168,7 +24001,16 @@ enifed("ember-routing/system/route",
         @param {...*} args
       */
       send: function() {
-        return this.router.send.apply(this.router, arguments);
+        if (this.router || !Ember.testing) {
+          this.router.send.apply(this.router, arguments);
+        } else {
+          var name = arguments[0];
+          var args = slice.call(arguments, 1);
+          var action = this._actions[name];
+          if (action) {
+            return this._actions[name].apply(this, args);
+          }
+        }
       },
 
       /**
@@ -24239,7 +24081,7 @@ enifed("ember-routing/system/route",
         be useful, for instance, for retrieving async code from
         the server that is required to enter a route.
 
-        ```js
+        ```javascript
         App.PostRoute = Ember.Route.extend({
           beforeModel: function(transition) {
             if (!App.Post) {
@@ -24260,7 +24102,7 @@ enifed("ember-routing/system/route",
         from the shared error handling behavior of the `error`
         hook):
 
-        ```js
+        ```javascript
         App.PostRoute = Ember.Route.extend({
           beforeModel: function(transition) {
             if (!App.Post) {
@@ -24301,7 +24143,7 @@ enifed("ember-routing/system/route",
         logic that can only take place after the model has already
         resolved.
 
-        ```js
+        ```javascript
         App.PostsRoute = Ember.Route.extend({
           afterModel: function(posts, transition) {
             if (posts.get('length') === 1) {
@@ -24367,9 +24209,9 @@ enifed("ember-routing/system/route",
         A hook you can implement to convert the URL into the model for
         this route.
 
-        ```js
+        ```javascript
         App.Router.map(function() {
-          this.resource('post', {path: '/posts/:post_id'});
+          this.resource('post', { path: '/posts/:post_id' });
         });
         ```
 
@@ -24393,7 +24235,7 @@ enifed("ember-routing/system/route",
 
         Routes without dynamic segments will always execute the model hook.
 
-        ```js
+        ```javascript
         // no dynamic segment, model hook always called
         this.transitionTo('posts');
 
@@ -24413,7 +24255,7 @@ enifed("ember-routing/system/route",
 
         Example
 
-        ```js
+        ```javascript
         App.PostRoute = Ember.Route.extend({
           model: function(params) {
             return this.store.find('post', params.post_id);
@@ -24518,15 +24360,15 @@ enifed("ember-routing/system/route",
         A hook you can implement to convert the route's model into parameters
         for the URL.
 
-        ```js
+        ```javascript
         App.Router.map(function() {
-          this.resource('post', {path: '/posts/:post_id'});
+          this.resource('post', { path: '/posts/:post_id' });
         });
 
         App.PostRoute = Ember.Route.extend({
           model: function(params) {
             // the server returns `{ id: 12 }`
-            return jQuery.getJSON("/posts/" + params.post_id);
+            return Ember.$.getJSON('/posts/' + params.post_id);
           },
 
           serialize: function(model) {
@@ -24579,7 +24421,7 @@ enifed("ember-routing/system/route",
         when implementing your `setupController` function, make sure to call
         `_super`:
 
-        ```js
+        ```javascript
         App.PhotosRoute = Ember.Route.extend({
           model: function() {
             return this.store.find('photo');
@@ -24609,9 +24451,9 @@ enifed("ember-routing/system/route",
 
         As an example, consider the router:
 
-        ```js
+        ```javascript
         App.Router.map(function() {
-          this.resource('post', {path: '/posts/:post_id'});
+          this.resource('post', { path: '/posts/:post_id' });
         });
         ```
 
@@ -24621,7 +24463,7 @@ enifed("ember-routing/system/route",
 
         Example
 
-        ```js
+        ```javascript
         App.PostRoute = Ember.Route.extend({
           setupController: function(controller, model) {
             controller.set('model', model);
@@ -24645,7 +24487,7 @@ enifed("ember-routing/system/route",
         The controller instance must already have been created, either through entering the
         associated route or using `generateController`.
 
-        ```js
+        ```javascript
         App.PostRoute = Ember.Route.extend({
           setupController: function(controller, post) {
             this._super(controller, post);
@@ -24684,7 +24526,7 @@ enifed("ember-routing/system/route",
 
         Example
 
-        ```js
+        ```javascript
         App.PostRoute = Ember.Route.extend({
           setupController: function(controller, post) {
             this._super(controller, post);
@@ -24716,7 +24558,7 @@ enifed("ember-routing/system/route",
 
         Example
 
-        ```js
+        ```javascript
         App.Router.map(function() {
             this.resource('post', { path: '/post/:post_id' }, function() {
                 this.resource('comments');
@@ -24760,7 +24602,7 @@ enifed("ember-routing/system/route",
         This method can be overridden to set up and render additional or
         alternative templates.
 
-        ```js
+        ```javascript
         App.PostsRoute = Ember.Route.extend({
           renderTemplate: function(controller, model) {
             var favController = this.controllerFor('favoritePost');
@@ -24792,7 +24634,7 @@ enifed("ember-routing/system/route",
 
         For example, given the following minimal router and templates:
 
-        ```js
+        ```javascript
         Router.map(function() {
           this.resource('photos');
         });
@@ -24813,7 +24655,7 @@ enifed("ember-routing/system/route",
         You can render `photos.hbs` into the `"anOutletName"` outlet of
         `application.hbs` by calling `render`:
 
-        ```js
+        ```javascript
         // posts route
         Ember.Route.extend({
           renderTemplate: function(){
@@ -24829,7 +24671,7 @@ enifed("ember-routing/system/route",
         `model` objects should be loaded and associated with the rendered template.
 
 
-        ```js
+        ```javascript
         // posts route
         Ember.Route.extend({
           renderTemplate: function(controller, model){
@@ -24851,19 +24693,19 @@ enifed("ember-routing/system/route",
 
         Not all options need to be passed to `render`. Default values will be used
         based on the name of the route specified in the router or the Route's
-        `controllerName`, `viewName` and and `templateName` properties.
+        `controllerName`, `viewName` and `templateName` properties.
 
         For example:
 
-        ```js
+        ```javascript
         // router
         Router.map(function() {
           this.route('index');
-          this.resource('post', {path: '/posts/:post_id'});
+          this.resource('post', { path: '/posts/:post_id' });
         });
         ```
 
-        ```js
+        ```javascript
         // post route
         PostRoute = App.Route.extend({
           renderTemplate: function() {
@@ -24877,7 +24719,7 @@ enifed("ember-routing/system/route",
         The following equivalent default options will be applied when
         the Route calls `render`:
 
-        ```js
+        ```javascript
         //
         this.render('post', {  // the template name associated with 'post' Route
           into: 'application', // the parent route to 'post' Route
@@ -24959,7 +24801,7 @@ enifed("ember-routing/system/route",
 
         Example:
 
-        ```js
+        ```javascript
         App.ApplicationRoute = App.Route.extend({
           actions: {
             showModal: function(evt) {
@@ -24982,7 +24824,7 @@ enifed("ember-routing/system/route",
 
         Example:
 
-        ```js
+        ```javascript
         hideModal: function(evt) {
           this.disconnectOutlet('modal');
         }
@@ -25029,6 +24871,12 @@ enifed("ember-routing/system/route",
       }
     });
 
+    
+      // TODO add mixin directly to `Route` class definition above, once this
+      // feature is merged:
+      Route.reopen(Evented);
+    
+
     var defaultQPMeta = {
       qps: [],
       map: {},
@@ -25073,7 +24921,6 @@ enifed("ember-routing/system/route",
       
       var controller = options.controller;
       var model = options.model;
-      var namedController;
 
       if (options.controller) {
         controller = options.controller;
@@ -25143,11 +24990,15 @@ enifed("ember-routing/system/route",
     }
 
     function generateTopLevelTeardown(view) {
-      return function() { view.destroy(); };
+      return function() {
+        view.destroy();
+      };
     }
 
     function generateOutletTeardown(parentView, outlet) {
-      return function() { parentView.disconnectOutlet(outlet); };
+      return function() {
+        parentView.disconnectOutlet(outlet);
+      };
     }
 
     function getFullQueryParams(router, state) {
@@ -25197,8 +25048,8 @@ 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__) {
+  ["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-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/utils","ember-metal/platform","router","router/transition","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // FEATURES, Logger, K, assert
@@ -25209,32 +25060,25 @@ enifed("ember-routing/system/router",
     var computed = __dependency6__.computed;
     var merge = __dependency7__["default"];
     var run = __dependency8__["default"];
-    var forEach = __dependency9__.forEach;
 
-    var fmt = __dependency10__.fmt;
-    var EmberObject = __dependency11__["default"];
-    var Evented = __dependency12__["default"];
-    var EmberRouterDSL = __dependency13__["default"];
-    var EmberView = __dependency14__["default"];
-    var EmberLocation = __dependency15__["default"];
-    var _MetamorphView = __dependency16__["default"];
-    var routeArgs = __dependency17__.routeArgs;
-    var getActiveTargetName = __dependency17__.getActiveTargetName;
-    var stashParamNames = __dependency17__.stashParamNames;
-    var create = __dependency18__.create;
+    var fmt = __dependency9__.fmt;
+    var EmberObject = __dependency10__["default"];
+    var Evented = __dependency11__["default"];
+    var EmberRouterDSL = __dependency12__["default"];
+    var EmberView = __dependency13__["default"];
+    var EmberLocation = __dependency14__["default"];
+    var _MetamorphView = __dependency15__["default"];
+    var routeArgs = __dependency16__.routeArgs;
+    var getActiveTargetName = __dependency16__.getActiveTargetName;
+    var stashParamNames = __dependency16__.stashParamNames;
+    var create = __dependency17__.create;
 
     /**
     @module ember
     @submodule ember-routing
     */
 
-    // // side effect of loading some Ember globals, for now
-    // requireModule("ember-handlebars");
-    // requireModule("ember-runtime");
-    // requireModule("ember-views");
-
-    var Router = requireModule("router")['default'];
-    var Transition = requireModule("router/transition").Transition;
+    var Router = __dependency18__["default"];
 
     var slice = [].slice;
 
@@ -25312,6 +25156,7 @@ enifed("ember-routing/system/router",
         var container = this.container;
         var self = this;
         var initialURL = get(this, 'initialURL');
+        var initialTransition;
 
         // Allow the Location class to cancel the router setup while it refreshes
         // the page
@@ -25331,8 +25176,10 @@ enifed("ember-routing/system/router",
         if (typeof initialURL === "undefined") {
           initialURL = location.getURL();
         }
-
-        this.handleURL(initialURL);
+        initialTransition = this.handleURL(initialURL);
+        if (initialTransition && initialTransition.error) {
+          throw initialTransition.error;
+        }
       },
 
       /**
@@ -25362,6 +25209,9 @@ enifed("ember-routing/system/router",
       },
 
       handleURL: function(url) {
+        // Until we have an ember-idiomatic way of accessing #hashes, we need to
+        // remove it because router.js doesn't know how to handle it.
+        url = url.split(/#(.+)?/)[0];
         return this._doURLTransition('handleURL', url);
       },
 
@@ -25490,7 +25340,9 @@ enifed("ember-routing/system/router",
         var rootURL = get(this, 'rootURL');
 
         if (rootURL && this.container && !this.container.has('-location-setting:root-url')) {
-          this.container.register('-location-setting:root-url', rootURL, { instantiate: false });
+          this.container.register('-location-setting:root-url', rootURL, {
+            instantiate: false
+          });
         }
 
         if ('string' === typeof location && this.container) {
@@ -25500,7 +25352,9 @@ enifed("ember-routing/system/router",
             location = set(this, 'location', resolvedLocation);
           } else {
             // Allow for deprecated registration of custom location API's
-            var options = {implementation: location};
+            var options = {
+              implementation: location
+            };
 
             location = set(this, 'location', EmberLocation.create(options));
           }
@@ -25520,7 +25374,8 @@ enifed("ember-routing/system/router",
       },
 
       _getHandlerFunction: function() {
-        var seen = {}, container = this.container;
+        var seen = create(null);
+        var container = this.container;
         var DefaultRoute = container.lookupFactory('route:basic');
         var self = this;
 
@@ -25528,7 +25383,9 @@ enifed("ember-routing/system/router",
           var routeName = 'route:' + name;
           var handler = container.lookup(routeName);
 
-          if (seen[name]) { return handler; }
+          if (seen[name]) {
+            return handler;
+          }
 
           seen[name] = true;
 
@@ -25647,7 +25504,8 @@ enifed("ember-routing/system/router",
           return this._qpCache[leafRouteName];
         }
 
-        var map = {}, qps = [], qpCache = this._qpCache[leafRouteName] = {
+        var map = {}, qps = [];
+        this._qpCache[leafRouteName] = {
           map: map,
           qps: qps
         };
@@ -26051,7 +25909,6 @@ enifed("ember-routing/system/router",
 
     function forEachQueryParam(router, targetRouteName, queryParams, callback) {
       var qpCache = router._queryParamsFor(targetRouteName);
-      var qps = qpCache.qps;
 
       for (var key in queryParams) {
         if (!queryParams.hasOwnProperty(key)) { continue; }
@@ -26066,9 +25923,62 @@ enifed("ember-routing/system/router",
 
     __exports__["default"] = EmberRouter;
   });
+enifed("ember-routing/utils",
+  ["ember-metal/utils","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var typeOf = __dependency1__.typeOf;
+
+    function routeArgs(targetRouteName, models, queryParams) {
+      var args = [];
+      if (typeOf(targetRouteName) === 'string') {
+        args.push('' + targetRouteName);
+      }
+      args.push.apply(args, models);
+      args.push({ queryParams: queryParams });
+      return args;
+    }
+
+    __exports__.routeArgs = routeArgs;function getActiveTargetName(router) {
+      var handlerInfos = router.activeTransition ?
+                         router.activeTransition.state.handlerInfos :
+                         router.state.handlerInfos;
+      return handlerInfos[handlerInfos.length - 1].name;
+    }
+
+    __exports__.getActiveTargetName = getActiveTargetName;function stashParamNames(router, handlerInfos) {
+      if (handlerInfos._namesStashed) { return; }
+
+      // This helper exists because router.js/route-recognizer.js awkwardly
+      // keeps separate a handlerInfo's list of parameter names depending
+      // on whether a URL transition or named transition is happening.
+      // Hopefully we can remove this in the future.
+      var targetRouteName = handlerInfos[handlerInfos.length-1].name;
+      var recogHandlers = router.router.recognizer.handlersFor(targetRouteName);
+      var dynamicParent = null;
+
+      for (var i = 0, len = handlerInfos.length; i < len; ++i) {
+        var handlerInfo = handlerInfos[i];
+        var names = recogHandlers[i].names;
+
+        if (names.length) {
+          dynamicParent = handlerInfo;
+        }
+
+        handlerInfo._names = names;
+
+        var route = handlerInfo.handler;
+        route._stashNames(handlerInfo, dynamicParent);
+      }
+
+      handlerInfos._namesStashed = true;
+    }
+
+    __exports__.stashParamNames = stashParamNames;
+  });
 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"],
-  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__) {
+  ["ember-metal","ember-runtime/core","ember-runtime/compare","ember-runtime/copy","ember-runtime/inject","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/tracked_array","ember-runtime/system/subarray","ember-runtime/system/container","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/system/service","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__, __dependency45__, __exports__) {
     "use strict";
     /**
     Ember Runtime
@@ -26083,13 +25993,13 @@ enifed("ember-runtime",
     var isEqual = __dependency2__.isEqual;
     var compare = __dependency3__["default"];
     var copy = __dependency4__["default"];
+    var inject = __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 Namespace = __dependency6__["default"];
+    var EmberObject = __dependency7__["default"];
+    var TrackedArray = __dependency8__["default"];
+    var SubArray = __dependency9__["default"];
+    var Container = __dependency10__["default"];
     var ArrayProxy = __dependency11__["default"];
     var ObjectProxy = __dependency12__["default"];
     var CoreObject = __dependency13__["default"];
@@ -26146,7 +26056,9 @@ enifed("ember-runtime",
     var Controller = __dependency40__["default"];
     var ControllerMixin = __dependency41__["default"];
 
-    var RSVP = __dependency42__["default"];
+    var Service = __dependency42__["default"];
+
+    var RSVP = __dependency43__["default"];
         // just for side effect of extending Ember.RSVP
       // just for side effect of extending String.prototype
     // just for side effect of extending Function.prototype
@@ -26157,6 +26069,7 @@ enifed("ember-runtime",
     Ember.copy = copy;
     Ember.isEqual = isEqual;
 
+    
     Ember.Array = EmberArray;
 
     Ember.Comparable = Comparable;
@@ -26228,6 +26141,7 @@ enifed("ember-runtime",
     Ember.Controller = Controller;
     Ember.ControllerMixin = ControllerMixin;
 
+    
     Ember._ProxyMixin = _ProxyMixin;
 
     Ember.RSVP = RSVP;
@@ -26354,7 +26268,6 @@ enifed("ember-runtime/computed/array_computed",
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
-    var reduceComputed = __dependency2__.reduceComputed;
     var ReduceComputedProperty = __dependency2__.ReduceComputedProperty;
     var forEach = __dependency3__.forEach;
     var o_create = __dependency4__.create;
@@ -26543,32 +26456,30 @@ enifed("ember-runtime/computed/array_computed",
     __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__) {
+  ["ember-metal/core","ember-metal/property_get","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__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert
     var e_get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var guidFor = __dependency4__.guidFor;
-    var metaFor = __dependency4__.meta;
-    var EmberError = __dependency5__["default"];
-    var propertyWillChange = __dependency6__.propertyWillChange;
-    var propertyDidChange = __dependency6__.propertyDidChange;
-    var expandProperties = __dependency7__["default"];
-    var addObserver = __dependency8__.addObserver;
-    var observersFor = __dependency8__.observersFor;
-    var removeObserver = __dependency8__.removeObserver;
-    var addBeforeObserver = __dependency8__.addBeforeObserver;
-    var removeBeforeObserver = __dependency8__.removeBeforeObserver;
-    var ComputedProperty = __dependency9__.ComputedProperty;
-    var cacheFor = __dependency9__.cacheFor;
-    var o_create = __dependency10__.create;
-    var forEach = __dependency11__.forEach;
-    var TrackedArray = __dependency12__["default"];
-    var EmberArray = __dependency13__["default"];
-    var run = __dependency14__["default"];
-    var isArray = __dependency4__.isArray;
+    var guidFor = __dependency3__.guidFor;
+    var metaFor = __dependency3__.meta;
+    var EmberError = __dependency4__["default"];
+    var propertyWillChange = __dependency5__.propertyWillChange;
+    var propertyDidChange = __dependency5__.propertyDidChange;
+    var expandProperties = __dependency6__["default"];
+    var addObserver = __dependency7__.addObserver;
+    var removeObserver = __dependency7__.removeObserver;
+    var addBeforeObserver = __dependency7__.addBeforeObserver;
+    var removeBeforeObserver = __dependency7__.removeBeforeObserver;
+    var ComputedProperty = __dependency8__.ComputedProperty;
+    var cacheFor = __dependency8__.cacheFor;
+    var o_create = __dependency9__.create;
+    var forEach = __dependency10__.forEach;
+    var TrackedArray = __dependency11__["default"];
+    var EmberArray = __dependency12__["default"];
+    var run = __dependency13__["default"];
+    var isArray = __dependency3__.isArray;
 
     var cacheSet = cacheFor.set;
     var cacheGet = cacheFor.get;
@@ -26936,7 +26847,6 @@ enifed("ember-runtime/computed/reduce_computed",
     }
 
     function reset(cp, propertyName) {
-      var callbacks = cp._callbacks();
       var hadMeta = cp._hasInstanceMeta(this, propertyName);
       var meta = cp._instanceMeta(this, propertyName);
 
@@ -27036,7 +26946,6 @@ enifed("ember-runtime/computed/reduce_computed",
       };
 
       var recompute = function(propertyName) {
-        var dependentKeys = cp._dependentKeys;
         var meta = cp._instanceMeta(this, propertyName);
         var callbacks = cp._callbacks();
 
@@ -27158,7 +27067,7 @@ enifed("ember-runtime/computed/reduce_computed",
       var cp = this;
       var args = a_slice.call(arguments);
       var propertyArgs = {};
-      var match, dependentArrayKey, itemPropertyKey;
+      var match, dependentArrayKey;
 
       forEach(args, function (dependentKey) {
         if (doubleEachPropertyPattern.test(dependentKey)) {
@@ -27399,8 +27308,8 @@ 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__) {
+  ["ember-metal/core","ember-metal/property_get","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__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -27410,18 +27319,17 @@ 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 isArray = __dependency3__.isArray;
+    var guidFor = __dependency3__.guidFor;
+    var EmberError = __dependency4__["default"];
+    var forEach = __dependency5__.forEach;
+    var run = __dependency6__["default"];
+    var addObserver = __dependency7__.addObserver;
+    var arrayComputed = __dependency8__.arrayComputed;
+    var reduceComputed = __dependency9__.reduceComputed;
+    var SubArray = __dependency10__["default"];
+    var keys = __dependency11__["default"];
+    var compare = __dependency12__["default"];
 
     var a_slice = [].slice;
 
@@ -27888,7 +27796,6 @@ enifed("ember-runtime/computed/reduce_computed_macros",
         removedItem: function(array, item, changeMeta, instanceMeta) {
           var itemGuid = guidFor(item);
           var dependentGuid = guidFor(changeMeta.arrayChanged);
-          var numberOfDependentArrays = changeMeta.property._dependentKeys.length;
           var numberOfArraysItemAppearsIn;
           var itemCounts = instanceMeta.itemCounts;
 
@@ -28238,8 +28145,8 @@ enifed("ember-runtime/computed/reduce_computed_macros",
     }
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/property_get","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__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -28248,14 +28155,13 @@ enifed("ember-runtime/controllers/array_controller",
 
     var Ember = __dependency1__["default"];
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var forEach = __dependency4__.forEach;
-    var replace = __dependency4__.replace;
-    var ArrayProxy = __dependency5__["default"];
-    var SortableMixin = __dependency6__["default"];
-    var ControllerMixin = __dependency7__["default"];
-    var computed = __dependency8__.computed;
-    var EmberError = __dependency9__["default"];
+    var forEach = __dependency3__.forEach;
+    var replace = __dependency3__.replace;
+    var ArrayProxy = __dependency4__["default"];
+    var SortableMixin = __dependency5__["default"];
+    var ControllerMixin = __dependency6__["default"];
+    var computed = __dependency7__.computed;
+    var EmberError = __dependency8__["default"];
 
 
     /**
@@ -28281,8 +28187,8 @@ enifed("ember-runtime/controllers/array_controller",
       Then, create a view that binds to your new controller:
 
       ```handlebars
-      {{#each MyApp.listController}}
-        {{firstName}} {{lastName}}
+      {{#each person in MyApp.listController}}
+        {{person.firstName}} {{person.lastName}}
       {{/each}}
       ```
 
@@ -28527,11 +28433,14 @@ enifed("ember-runtime/controllers/array_controller",
     });
   });
 enifed("ember-runtime/controllers/controller",
-  ["ember-runtime/system/object","ember-runtime/mixins/controller","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+  ["ember-metal/core","ember-runtime/system/object","ember-runtime/mixins/controller","ember-runtime/inject","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
-    var EmberObject = __dependency1__["default"];
-    var Mixin = __dependency2__["default"];
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var EmberObject = __dependency2__["default"];
+    var Mixin = __dependency3__["default"];
+    var createInjectionHelper = __dependency4__.createInjectionHelper;
 
     /**
     @module ember
@@ -28544,7 +28453,13 @@ enifed("ember-runtime/controllers/controller",
       @extends Ember.Object
       @uses Ember.ControllerMixin
     */
-    __exports__["default"] = EmberObject.extend(Mixin);
+    var Controller = EmberObject.extend(Mixin);
+
+    function controllerInjectionHelper(factory) {
+          }
+
+    
+    __exports__["default"] = Controller;
   });
 enifed("ember-runtime/controllers/object_controller",
   ["ember-runtime/mixins/controller","ember-runtime/system/object_proxy","exports"],
@@ -28644,8 +28559,9 @@ enifed("ember-runtime/copy",
       any type of object and create a clone of it, including primitive values
       (which are not actually cloned because they are immutable).
 
-      If the passed object implements the `clone()` method, then this function
-      will simply call that method and return the result.
+      If the passed object implements the `copy()` method, then this function
+      will simply call that method and return the result. Please see
+      `Ember.Copyable` for further details.
 
       @method copy
       @for Ember
@@ -28926,8 +28842,8 @@ enifed("ember-runtime/ext/function",
     }
   });
 enifed("ember-runtime/ext/rsvp",
-  ["ember-metal/core","ember-metal/logger","ember-metal/run_loop","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/core","ember-metal/logger","ember-metal/run_loop","rsvp","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /* globals RSVP:true */
 
@@ -28935,7 +28851,12 @@ enifed("ember-runtime/ext/rsvp",
     var Logger = __dependency2__["default"];
     var run = __dependency3__["default"];
 
-    var RSVP = requireModule('rsvp');
+    // this is technically incorrect (per @wycats)
+    // it should be `import * as RSVP from 'rsvp';` but
+    // Esprima does not support this syntax yet (and neither does
+    // es6-module-transpiler 0.4.0 - 0.6.2).
+    var RSVP = __dependency4__;
+
     var testModuleName = 'ember-testing/test';
     var Test;
 
@@ -28967,7 +28888,7 @@ enifed("ember-runtime/ext/rsvp",
     };
 
     RSVP.onerrorDefault = function (error) {
-      if (error instanceof Error) {
+      if (error && error.name !== 'TransitionAborted') {
         if (Ember.testing) {
           // ES6TODO: remove when possible
           if (!Test && Ember.__loader.registry[testModuleName]) {
@@ -28976,6 +28897,7 @@ enifed("ember-runtime/ext/rsvp",
 
           if (Test && Test.adapter) {
             Test.adapter.exception(error);
+            Logger.error(error.stack);
           } else {
             throw error;
           }
@@ -29107,9 +29029,91 @@ enifed("ember-runtime/ext/string",
       };
     }
   });
+enifed("ember-runtime/inject",
+  ["ember-metal/core","ember-metal/enumerable_utils","ember-metal/injected_property","ember-metal/keys","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var indexOf = __dependency2__.indexOf;
+    var InjectedProperty = __dependency3__["default"];
+    var keys = __dependency4__["default"];
+
+    /**
+      Namespace for injection helper methods.
+
+      @class inject
+      @namespace Ember
+      */
+    function inject() {
+          }
+
+    // Dictionary of injection validations by type, added to by `createInjectionHelper`
+    var typeValidators = {};
+
+    /**
+      This method allows other Ember modules to register injection helpers for a
+      given container type. Helpers are exported to the `inject` namespace as the
+      container type itself.
+
+      @private
+      @method createInjectionHelper
+      @namespace Ember
+      @param {String} type The container type the helper will inject
+      @param {Function} validator A validation callback that is executed at mixin-time
+    */
+    function createInjectionHelper(type, validator) {
+      typeValidators[type] = validator;
+
+      inject[type] = function(name) {
+        return new InjectedProperty(type, name);
+      };
+    }
+
+    __exports__.createInjectionHelper = createInjectionHelper;/**
+      Validation function intended to be invoked at when extending a factory with
+      injected properties. Runs per-type validation functions once for each injected
+      type encountered.
+
+      Note that this currently modifies the mixin themselves, which is technically
+      dubious but is practically of little consequence. This may change in the
+      future.
+
+      @private
+      @method validatePropertyInjections
+      @namespace Ember
+      @param {Object} factory The factory object being extended
+      @param {Object} props A hash of properties to be added to the factory
+    */
+    function validatePropertyInjections(factory, props) {
+      var types = [];
+      var key, desc, validator, i, l;
+
+      for (key in props) {
+        desc = props[key];
+        if (desc instanceof InjectedProperty && indexOf(types, desc.type) === -1) {
+          types.push(desc.type);
+        }
+      }
+
+      if (types.length) {
+        for (i = 0, l = types.length; i < l; i++) {
+          validator = typeValidators[types[i]];
+
+          if (typeof validator === 'function') {
+            validator(factory);
+          }
+        }
+      }
+
+      return true;
+    }
+
+    __exports__.validatePropertyInjections = validatePropertyInjections;__exports__["default"] = inject;
+  });
 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__) {
+  ["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","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -29132,7 +29136,6 @@ enifed("ember-runtime/mixins/-proxy",
     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."
@@ -29363,6 +29366,7 @@ enifed("ember-runtime/mixins/action_handler",
         @method willMergeMixin
       */
       willMergeMixin: function(props) {
+        
         var hashName;
 
         if (!props._actions) {
@@ -29444,11 +29448,11 @@ 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 isNone = __dependency4__["default"];
     var Enumerable = __dependency5__["default"];
     var map = __dependency6__.map;
     var Mixin = __dependency7__.Mixin;
@@ -29994,17 +29998,13 @@ enifed("ember-runtime/mixins/comparable",
     });
   });
 enifed("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__) {
+  ["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__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-    // Ember.assert, Ember.deprecate
-    var get = __dependency2__.get;
-    var EmberObject = __dependency3__["default"];
-    var Mixin = __dependency4__.Mixin;
-    var computed = __dependency5__.computed;
-    var ActionHandler = __dependency6__["default"];
-    var ControllerContentModelAliasDeprecation = __dependency7__["default"];
+    var Mixin = __dependency1__.Mixin;
+    var computed = __dependency2__.computed;
+    var ActionHandler = __dependency3__["default"];
+    var ControllerContentModelAliasDeprecation = __dependency4__["default"];
 
     /**
       `Ember.ControllerMixin` provides a standard interface for all classes that
@@ -30062,13 +30062,12 @@ enifed("ember-runtime/mixins/controller",
     });
   });
 enifed("ember-runtime/mixins/controller_content_model_alias_deprecation",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/core","ember-metal/mixin","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.deprecate
-    var get = __dependency2__.get;
-    var Mixin = __dependency3__.Mixin;
+    var Mixin = __dependency2__.Mixin;
 
     /**
       The ControllerContentModelAliasDeprecation mixin is used to provide a useful
@@ -30120,8 +30119,8 @@ enifed("ember-runtime/mixins/controller_content_model_alias_deprecation",
     });
   });
 enifed("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__) {
+  ["ember-metal/property_get","ember-metal/mixin","ember-runtime/mixins/freezable","ember-runtime/system/string","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -30130,12 +30129,11 @@ enifed("ember-runtime/mixins/copyable",
 
 
     var get = __dependency1__.get;
-    var set = __dependency2__.set;
-    var required = __dependency3__.required;
-    var Freezable = __dependency4__.Freezable;
-    var Mixin = __dependency3__.Mixin;
-    var fmt = __dependency5__.fmt;
-    var EmberError = __dependency6__["default"];
+    var required = __dependency2__.required;
+    var Freezable = __dependency3__.Freezable;
+    var Mixin = __dependency2__.Mixin;
+    var fmt = __dependency4__.fmt;
+    var EmberError = __dependency5__["default"];
 
 
     /**
@@ -30302,7 +30300,7 @@ enifed("ember-runtime/mixins/enumerable",
     var contexts = [];
 
     function popCtx() {
-      return contexts.length===0 ? {} : contexts.pop();
+      return contexts.length === 0 ? {} : contexts.pop();
     }
 
     function pushCtx(ctx) {
@@ -30315,7 +30313,7 @@ enifed("ember-runtime/mixins/enumerable",
 
       function i(item) {
         var cur = get(item, key);
-        return valueProvided ? value===cur : !!cur;
+        return valueProvided ? value === cur : !!cur;
       }
 
       return i;
@@ -30406,8 +30404,8 @@ enifed("ember-runtime/mixins/enumerable",
         If your enumerable is empty, this method should return `undefined`.
 
         ```javascript
-        var arr = ["a", "b", "c"];
-        arr.get('firstObject');  // "a"
+        var arr = ['a', 'b', 'c'];
+        arr.get('firstObject');  // 'a'
 
         var arr = [];
         arr.get('firstObject');  // undefined
@@ -30417,12 +30415,16 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Object} the object or undefined
       */
       firstObject: computed('[]', function() {
-        if (get(this, 'length')===0) return undefined ;
+        if (get(this, 'length') === 0) {
+          return undefined;
+        }
 
         // handle generic enumerables
-        var context = popCtx(), ret;
-        ret = this.nextObject(0, null, context);
+        var context = popCtx();
+        var ret = this.nextObject(0, null, context);
+
         pushCtx(context);
+
         return ret;
       }),
 
@@ -30432,8 +30434,8 @@ enifed("ember-runtime/mixins/enumerable",
         If your enumerable is empty, this method should return `undefined`.
 
         ```javascript
-        var arr = ["a", "b", "c"];
-        arr.get('lastObject');  // "c"
+        var arr = ['a', 'b', 'c'];
+        arr.get('lastObject');  // 'c'
 
         var arr = [];
         arr.get('lastObject');  // undefined
@@ -30444,13 +30446,23 @@ enifed("ember-runtime/mixins/enumerable",
       */
       lastObject: computed('[]', function() {
         var len = get(this, 'length');
-        if (len===0) return undefined ;
-        var context = popCtx(), idx=0, cur, last = null;
+
+        if (len === 0) {
+          return undefined;
+        }
+
+        var context = popCtx();
+        var idx = 0;
+        var last = null;
+        var cur;
+
         do {
           last = cur;
           cur = this.nextObject(idx++, last, context);
         } while (cur !== undefined);
+
         pushCtx(context);
+
         return last;
       }),
 
@@ -30460,9 +30472,10 @@ enifed("ember-runtime/mixins/enumerable",
         is found. You may want to override this with a more efficient version.
 
         ```javascript
-        var arr = ["a", "b", "c"];
-        arr.contains("a"); // true
-        arr.contains("z"); // false
+        var arr = ['a', 'b', 'c'];
+
+        arr.contains('a'); // true
+        arr.contains('z'); // false
         ```
 
         @method contains
@@ -30470,7 +30483,11 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Boolean} `true` if object is found in enumerable.
       */
       contains: function(obj) {
-        return this.find(function(item) { return item===obj; }) !== undefined;
+        var found = this.find(function(item) {
+          return item === obj;
+        });
+        
+        return found !== undefined;
       },
 
       /**
@@ -30499,18 +30516,27 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Object} receiver
       */
       forEach: function(callback, target) {
-        if (typeof callback !== 'function') throw new TypeError() ;
-        var len = get(this, 'length'), last = null, context = popCtx();
+        if (typeof callback !== 'function') {
+          throw new TypeError();
+        }
 
-        if (target === undefined) target = null;
+        var context = popCtx();
+        var len = get(this, 'length');
+        var last = null;
 
-        for(var idx=0;idx<len;idx++) {
+        if (target === undefined) {
+          target = null;
+        }
+
+        for(var idx = 0; idx < len; idx++) {
           var next = this.nextObject(idx, last, context) ;
           callback.call(target, next, idx, this);
           last = next ;
         }
+
         last = null ;
         context = pushCtx(context);
+
         return this ;
       },
 
@@ -30570,9 +30596,11 @@ enifed("ember-runtime/mixins/enumerable",
       */
       map: function(callback, target) {
         var ret = Ember.A();
+
         this.forEach(function(x, idx, i) {
           ret[idx] = callback.call(target, x, idx,i);
         });
+
         return ret ;
       },
 
@@ -30632,9 +30660,13 @@ enifed("ember-runtime/mixins/enumerable",
       */
       filter: function(callback, target) {
         var ret = Ember.A();
+
         this.forEach(function(x, idx, i) {
-          if (callback.call(target, x, idx, i)) ret.push(x);
+          if (callback.call(target, x, idx, i)) {
+            ret.push(x);
+          }
         });
+
         return ret ;
       },
 
@@ -30708,8 +30740,14 @@ 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 exactValue = function(item) {
+          return get(item, key) === value;
+        };
+
+        var hasValue = function(item) {
+          return !!get(item, key);
+        };
+
         var use = (arguments.length === 2 ? exactValue : hasValue);
 
         return this.reject(use);
@@ -30757,19 +30795,31 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Object} Found item or `undefined`.
       */
       find: function(callback, target) {
-        var len = get(this, 'length') ;
-        if (target === undefined) target = null;
+        var len = get(this, 'length');
 
-        var last = null, next, found = false, ret ;
-        var context = popCtx();
-        for(var idx=0;idx<len && !found;idx++) {
-          next = this.nextObject(idx, last, context) ;
-          if (found = callback.call(target, next, idx, this)) ret = next ;
-          last = next ;
+        if (target === undefined) {
+          target = null;
         }
-        next = last = null ;
+
+        var context = popCtx();
+        var found = false;
+        var last = null;
+        var next, ret;
+
+        for(var idx = 0; idx < len && !found; idx++) {
+          next = this.nextObject(idx, last, context);
+
+          if (found = callback.call(target, next, idx, this)) {
+            ret = next;
+          }
+
+          last = next;
+        }
+
+        next = last = null;
         context = pushCtx(context);
-        return ret ;
+
+        return ret;
       },
 
       /**
@@ -30827,7 +30877,9 @@ enifed("ember-runtime/mixins/enumerable",
         Example Usage:
 
         ```javascript
-        if (people.every(isEngineer)) { Paychecks.addBigBonus(); }
+        if (people.every(isEngineer)) {
+          Paychecks.addBigBonus();
+        }
         ```
 
         @method every
@@ -30898,7 +30950,9 @@ enifed("ember-runtime/mixins/enumerable",
         Usage Example:
 
         ```javascript
-        if (people.any(isManager)) { Paychecks.addBiggerBonus(); }
+        if (people.any(isManager)) {
+          Paychecks.addBiggerBonus();
+        }
         ```
 
         @method any
@@ -30907,13 +30961,15 @@ 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 len = get(this, 'length');
         var context = popCtx();
-        var found   = false;
-        var last    = null;
+        var found = false;
+        var last = null;
         var next, idx;
 
-        if (target === undefined) { target = null; }
+        if (target === undefined) {
+          target = null;
+        }
 
         for (idx = 0; idx < len && !found; idx++) {
           next  = this.nextObject(idx, last, context);
@@ -30951,7 +31007,9 @@ enifed("ember-runtime/mixins/enumerable",
         Usage Example:
 
         ```javascript
-        if (people.some(isManager)) { Paychecks.addBiggerBonus(); }
+        if (people.some(isManager)) {
+          Paychecks.addBiggerBonus();
+        }
         ```
 
         @method some
@@ -31028,7 +31086,9 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Object} The reduced value.
       */
       reduce: function(callback, initialValue, reducerProperty) {
-        if (typeof callback !== "function") { throw new TypeError(); }
+        if (typeof callback !== 'function') {
+          throw new TypeError();
+        }
 
         var ret = initialValue;
 
@@ -31050,11 +31110,16 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Array} return values from calling invoke.
       */
       invoke: function(methodName) {
-        var args, ret = Ember.A();
-        if (arguments.length>1) args = a_slice.call(arguments, 1);
+        var ret = Ember.A();
+        var args;
+
+        if (arguments.length > 1) {
+          args = a_slice.call(arguments, 1);
+        }
 
         this.forEach(function(x, idx) {
           var method = x && x[methodName];
+
           if ('function' === typeof method) {
             ret[idx] = args ? apply(x, method, args) : x[methodName]();
           }
@@ -31072,23 +31137,29 @@ enifed("ember-runtime/mixins/enumerable",
       */
       toArray: function() {
         var ret = Ember.A();
-        this.forEach(function(o, idx) { ret[idx] = o; });
+
+        this.forEach(function(o, idx) {
+          ret[idx] = o;
+        });
+
         return ret;
       },
 
       /**
-        Returns a copy of the array with all null and undefined elements removed.
+        Returns a copy of the array with all `null` and `undefined` elements removed.
 
         ```javascript
-        var arr = ["a", null, "c", undefined];
-        arr.compact();  // ["a", "c"]
+        var arr = ['a', null, 'c', undefined];
+        arr.compact();  // ['a', 'c']
         ```
 
         @method compact
         @return {Array} the array without null and undefined elements.
       */
       compact: function() {
-        return this.filter(function(value) { return value != null; });
+        return this.filter(function(value) {
+          return value != null;
+        });
       },
 
       /**
@@ -31097,8 +31168,8 @@ enifed("ember-runtime/mixins/enumerable",
         the receiver does not contain the value.
 
         ```javascript
-        var arr = ["a", "b", "a", "c"];
-        arr.without("a");  // ["b", "c"]
+        var arr = ['a', 'b', 'a', 'c'];
+        arr.without('a');  // ['b', 'c']
         ```
 
         @method without
@@ -31106,12 +31177,19 @@ enifed("ember-runtime/mixins/enumerable",
         @return {Ember.Enumerable}
       */
       without: function(value) {
-        if (!this.contains(value)) return this; // nothing to do
+        if (!this.contains(value)) {
+          return this; // nothing to do
+        }
+
         var ret = Ember.A();
+
         this.forEach(function(k) {
-          if (k !== value) ret[ret.length] = k;
-        }) ;
-        return ret ;
+          if (k !== value) {
+            ret[ret.length] = k;
+          }
+        });
+
+        return ret;
       },
 
       /**
@@ -31119,18 +31197,24 @@ enifed("ember-runtime/mixins/enumerable",
         implementation returns an array regardless of the receiver type.
 
         ```javascript
-        var arr = ["a", "a", "b", "b"];
-        arr.uniq();  // ["a", "b"]
+        var arr = ['a', 'a', 'b', 'b'];
+        arr.uniq();  // ['a', 'b']
         ```
 
+        This only works on primitive data types, e.g. Strings, Numbers, etc.
+
         @method uniq
         @return {Ember.Enumerable}
       */
       uniq: function() {
         var ret = Ember.A();
+
         this.forEach(function(k) {
-          if (indexOf(ret, k)<0) ret.push(k);
+          if (indexOf(ret, k) < 0) {
+            ret.push(k);
+          }
         });
+
         return ret;
       },
 
@@ -31168,10 +31252,17 @@ enifed("ember-runtime/mixins/enumerable",
         var didChange  = (opts && opts.didChange) || 'enumerableDidChange';
         var hasObservers = get(this, 'hasEnumerableObservers');
 
-        if (!hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
+        if (!hasObservers) { 
+          propertyWillChange(this, 'hasEnumerableObservers');
+        }
+
         addListener(this, '@enumerable:before', target, willChange);
         addListener(this, '@enumerable:change', target, didChange);
-        if (!hasObservers) propertyDidChange(this, 'hasEnumerableObservers');
+
+        if (!hasObservers) {
+          propertyDidChange(this, 'hasEnumerableObservers');
+        }
+
         return this;
       },
 
@@ -31186,12 +31277,19 @@ enifed("ember-runtime/mixins/enumerable",
       removeEnumerableObserver: function(target, opts) {
         var willChange = (opts && opts.willChange) || 'enumerableWillChange';
         var didChange  = (opts && opts.didChange) || 'enumerableDidChange';
-
         var hasObservers = get(this, 'hasEnumerableObservers');
-        if (hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
+
+        if (hasObservers) {
+          propertyWillChange(this, 'hasEnumerableObservers');
+        }
+
         removeListener(this, '@enumerable:before', target, willChange);
         removeListener(this, '@enumerable:change', target, didChange);
-        if (hasObservers) propertyDidChange(this, 'hasEnumerableObservers');
+
+        if (hasObservers) {
+          propertyDidChange(this, 'hasEnumerableObservers');
+        }
+
         return this;
       },
 
@@ -31220,24 +31318,40 @@ enifed("ember-runtime/mixins/enumerable",
         @chainable
       */
       enumerableContentWillChange: function(removing, adding) {
-
         var removeCnt, addCnt, hasDelta;
 
-        if ('number' === typeof removing) removeCnt = removing;
-        else if (removing) removeCnt = get(removing, 'length');
-        else removeCnt = removing = -1;
+        if ('number' === typeof removing) {
+          removeCnt = removing;
+        } else if (removing) {
+          removeCnt = get(removing, 'length');
+        } else {
+          removeCnt = removing = -1;
+        }
 
-        if ('number' === typeof adding) addCnt = adding;
-        else if (adding) addCnt = get(adding,'length');
-        else addCnt = adding = -1;
+        if ('number' === typeof adding) {
+          addCnt = adding;
+        } else if (adding) {
+          addCnt = get(adding,'length');
+        } else {
+          addCnt = adding = -1;
+        }
 
-        hasDelta = addCnt<0 || removeCnt<0 || addCnt-removeCnt!==0;
+        hasDelta = addCnt < 0 || removeCnt < 0 || addCnt - removeCnt !== 0;
 
-        if (removing === -1) removing = null;
-        if (adding   === -1) adding   = null;
+        if (removing === -1) {
+          removing = null;
+        }
+
+        if (adding === -1) {
+          adding = null;
+        }
 
         propertyWillChange(this, '[]');
-        if (hasDelta) propertyWillChange(this, 'length');
+
+        if (hasDelta) {
+          propertyWillChange(this, 'length');
+        }
+
         sendEvent(this, '@enumerable:before', [this, removing, adding]);
 
         return this;
@@ -31260,21 +31374,38 @@ enifed("ember-runtime/mixins/enumerable",
       enumerableContentDidChange: function(removing, adding) {
         var removeCnt, addCnt, hasDelta;
 
-        if ('number' === typeof removing) removeCnt = removing;
-        else if (removing) removeCnt = get(removing, 'length');
-        else removeCnt = removing = -1;
+        if ('number' === typeof removing) {
+          removeCnt = removing;
+        } else if (removing) {
+          removeCnt = get(removing, 'length');
+        } else {
+          removeCnt = removing = -1;
+        }
 
-        if ('number' === typeof adding) addCnt = adding;
-        else if (adding) addCnt = get(adding, 'length');
-        else addCnt = adding = -1;
+        if ('number' === typeof adding) {
+          addCnt = adding;
+        } else if (adding) {
+          addCnt = get(adding, 'length');
+        } else {
+          addCnt = adding = -1;
+        }
 
-        hasDelta = addCnt<0 || removeCnt<0 || addCnt-removeCnt!==0;
+        hasDelta = addCnt < 0 || removeCnt < 0 || addCnt - removeCnt !== 0;
 
-        if (removing === -1) removing = null;
-        if (adding   === -1) adding   = null;
+        if (removing === -1) {
+          removing = null;
+        }
+
+        if (adding === -1) {
+          adding = null;
+        }
 
         sendEvent(this, '@enumerable:change', [this, removing, adding]);
-        if (hasDelta) propertyDidChange(this, 'length');
+
+        if (hasDelta) {
+          propertyDidChange(this, 'length');
+        }
+
         propertyDidChange(this, '[]');
 
         return this ;
@@ -31293,6 +31424,7 @@ enifed("ember-runtime/mixins/enumerable",
         */
       sortBy: function() {
         var sortKeys = arguments;
+
         return this.toArray().sort(function(a, b){
           for(var i = 0; i < sortKeys.length; i++) {
             var key = sortKeys[i];
@@ -31300,7 +31432,10 @@ enifed("ember-runtime/mixins/enumerable",
             var propB = get(b, key);
             // return 1 or -1 else continue to the next sortKey
             var compareValue = compare(propA, propB);
-            if (compareValue) { return compareValue; }
+
+            if (compareValue) {
+              return compareValue;
+            }
           }
           return 0;
         });
@@ -31563,8 +31698,8 @@ enifed("ember-runtime/mixins/freezable",
     __exports__.FROZEN_ERROR = FROZEN_ERROR;
   });
 enifed("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__) {
+  ["ember-metal/property_get","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__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -31587,14 +31722,13 @@ enifed("ember-runtime/mixins/mutable_array",
     //
 
     var get = __dependency1__.get;
-    var set = __dependency2__.set;
-    var isArray = __dependency3__.isArray;
-    var EmberError = __dependency4__["default"];
-    var Mixin = __dependency5__.Mixin;
-    var required = __dependency5__.required;
-    var EmberArray = __dependency6__["default"];
-    var MutableEnumerable = __dependency7__["default"];
-    var Enumerable = __dependency8__["default"];
+    var isArray = __dependency2__.isArray;
+    var EmberError = __dependency3__["default"];
+    var Mixin = __dependency4__.Mixin;
+    var required = __dependency4__.required;
+    var EmberArray = __dependency5__["default"];
+    var MutableEnumerable = __dependency6__["default"];
+    var Enumerable = __dependency7__["default"];
     /**
       This mixin defines the API for modifying array-like objects. These methods
       can be applied only to a collection that keeps its items in an ordered set.
@@ -31873,7 +32007,7 @@ enifed("ember-runtime/mixins/mutable_array",
       //
 
       /**
-        Remove all occurances of an object in the array.
+        Remove all occurrences of an object in the array.
 
         ```javascript
         var cities = ["Chicago", "Berlin", "Lima", "Chicago"];
@@ -32065,7 +32199,7 @@ enifed("ember-runtime/mixins/observable",
     var removeObserver = __dependency10__.removeObserver;
     var observersFor = __dependency10__.observersFor;
     var cacheFor = __dependency11__.cacheFor;
-    var isNone = __dependency12__.isNone;
+    var isNone = __dependency12__["default"];
 
 
     var slice = Array.prototype.slice;
@@ -32760,8 +32894,8 @@ enifed("ember-runtime/mixins/promise_proxy",
     }
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/property_get","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__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -32772,23 +32906,22 @@ enifed("ember-runtime/mixins/sortable",
     // Ember.assert, Ember.A
 
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var forEach = __dependency4__.forEach;
-    var Mixin = __dependency5__.Mixin;
-    var MutableEnumerable = __dependency6__["default"];
-    var compare = __dependency7__["default"];
-    var addObserver = __dependency8__.addObserver;
-    var removeObserver = __dependency8__.removeObserver;
-    var computed = __dependency9__.computed;
-    var beforeObserver = __dependency5__.beforeObserver;
-    var observer = __dependency5__.observer;
-    //ES6TODO: should we access these directly from their package or from how thier exposed in ember-metal?
+    var forEach = __dependency3__.forEach;
+    var Mixin = __dependency4__.Mixin;
+    var MutableEnumerable = __dependency5__["default"];
+    var compare = __dependency6__["default"];
+    var addObserver = __dependency7__.addObserver;
+    var removeObserver = __dependency7__.removeObserver;
+    var computed = __dependency8__.computed;
+    var beforeObserver = __dependency4__.beforeObserver;
+    var observer = __dependency4__.observer;
+    //ES6TODO: should we access these directly from their package or from how their exposed in ember-metal?
 
     /**
       `Ember.SortableMixin` provides a standard interface for array proxies
       to specify a sort order and maintain this sorting when objects are added,
       removed, or updated without changing the implicit order of their underlying
-      modelarray:
+      model array:
 
       ```javascript
       songs = [
@@ -32820,8 +32953,8 @@ enifed("ember-runtime/mixins/sortable",
       songsController.get('firstObject'); // {trackNumber: 4, title: 'Ob-La-Di, Ob-La-Da'}
       ```
 
-      SortableMixin works by sorting the arrangedContent array, which is the array that
-      arrayProxy displays. Due to the fact that the underlying 'content' array is not changed, that
+      `SortableMixin` works by sorting the `arrangedContent` array, which is the array that
+      `ArrayProxy` displays. Due to the fact that the underlying 'content' array is not changed, that
       array will not display the sorted list:
 
        ```javascript
@@ -32829,8 +32962,8 @@ enifed("ember-runtime/mixins/sortable",
       songsController.get('firstObject'); // Returns the sorted content.
       ```
 
-      Although the sorted content can also be accessed through the arrangedContent property,
-      it is preferable to use the proxied class and not the arrangedContent array directly.
+      Although the sorted content can also be accessed through the `arrangedContent` property,
+      it is preferable to use the proxied class and not the `arrangedContent` array directly.
 
       @class SortableMixin
       @namespace Ember
@@ -32839,7 +32972,7 @@ enifed("ember-runtime/mixins/sortable",
     __exports__["default"] = Mixin.create(MutableEnumerable, {
 
       /**
-        Specifies which properties dictate the arrangedContent's sort order.
+        Specifies which properties dictate the `arrangedContent`'s sort order.
 
         When specifying multiple properties the sorting will use properties
         from the `sortProperties` array prioritized from first to last.
@@ -32849,7 +32982,7 @@ enifed("ember-runtime/mixins/sortable",
       sortProperties: null,
 
       /**
-        Specifies the arrangedContent's sort direction.
+        Specifies the `arrangedContent`'s sort direction.
         Sorts the content in ascending order by default. Set to `false` to
         use descending order.
 
@@ -32861,13 +32994,14 @@ enifed("ember-runtime/mixins/sortable",
       /**
         The function used to compare two values. You can override this if you
         want to do custom comparisons. Functions must be of the type expected by
-        Array#sort, i.e.
-          return 0 if the two parameters are equal,
-          return a negative value if the first parameter is smaller than the second or
-          return a positive value otherwise:
+        Array#sort, i.e.,
+
+        *  return 0 if the two parameters are equal,
+        *  return a negative value if the first parameter is smaller than the second or
+        *  return a positive value otherwise:
 
         ```javascript
-        function(x,y) { // These are assumed to be integers
+        function(x, y) { // These are assumed to be integers
           if (x === y)
             return 0;
           return x < y ? -1 : 1;
@@ -32917,12 +33051,11 @@ enifed("ember-runtime/mixins/sortable",
       isSorted: computed.notEmpty('sortProperties'),
 
       /**
-        Overrides the default arrangedContent from arrayProxy in order to sort by sortFunction.
-        Also sets up observers for each sortProperty on each item in the content Array.
+        Overrides the default `arrangedContent` from `ArrayProxy` in order to sort by `sortFunction`.
+        Also sets up observers for each `sortProperty` on each item in the content Array.
 
         @property arrangedContent
       */
-
       arrangedContent: computed('content', 'sortProperties.@each', function(key, value) {
         var content = get(this, 'content');
         var isSorted = get(this, 'isSorted');
@@ -33065,8 +33198,8 @@ enifed("ember-runtime/mixins/sortable",
     });
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/mixin","ember-metal/computed","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -33076,10 +33209,9 @@ enifed("ember-runtime/mixins/target_action_support",
     // Ember.lookup, Ember.assert
 
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var typeOf = __dependency4__.typeOf;
-    var Mixin = __dependency5__.Mixin;
-    var computed = __dependency6__.computed;
+    var typeOf = __dependency3__.typeOf;
+    var Mixin = __dependency4__.Mixin;
+    var computed = __dependency5__.computed;
 
     /**
     `Ember.TargetActionSupport` is a mixin that can be included in a class
@@ -33222,25 +33354,25 @@ enifed("ember-runtime/system/application",
     __exports__["default"] = Namespace.extend();
   });
 enifed("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"],
+  ["ember-metal/core","ember-metal/property_get","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","ember-metal/alias","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.K, Ember.assert
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var isArray = __dependency4__.isArray;
-    var apply = __dependency4__.apply;
-    var computed = __dependency5__.computed;
-    var beforeObserver = __dependency6__.beforeObserver;
-    var observer = __dependency6__.observer;
-    var beginPropertyChanges = __dependency7__.beginPropertyChanges;
-    var endPropertyChanges = __dependency7__.endPropertyChanges;
-    var EmberError = __dependency8__["default"];
-    var EmberObject = __dependency9__["default"];
-    var MutableArray = __dependency10__["default"];
-    var Enumerable = __dependency11__["default"];
-    var fmt = __dependency12__.fmt;
+    var isArray = __dependency3__.isArray;
+    var apply = __dependency3__.apply;
+    var computed = __dependency4__.computed;
+    var beforeObserver = __dependency5__.beforeObserver;
+    var observer = __dependency5__.observer;
+    var beginPropertyChanges = __dependency6__.beginPropertyChanges;
+    var endPropertyChanges = __dependency6__.endPropertyChanges;
+    var EmberError = __dependency7__["default"];
+    var EmberObject = __dependency8__["default"];
+    var MutableArray = __dependency9__["default"];
+    var Enumerable = __dependency10__["default"];
+    var fmt = __dependency11__.fmt;
+    var alias = __dependency12__["default"];
 
     /**
     @module ember
@@ -33249,7 +33381,6 @@ enifed("ember-runtime/system/array_proxy",
 
     var OUT_OF_RANGE_EXCEPTION = "Index out of range";
     var EMPTY = [];
-    var alias = computed.alias;
     var K = Ember.K;
 
     /**
@@ -33591,18 +33722,18 @@ enifed("ember-runtime/system/array_proxy",
     __exports__["default"] = ArrayProxy;
   });
 enifed("ember-runtime/system/container",
-  ["ember-metal/property_set","exports"],
-  function(__dependency1__, __exports__) {
+  ["ember-metal/property_set","container","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var set = __dependency1__["default"];
+    var set = __dependency1__.set;
+    var Container = __dependency2__["default"];
 
-    var Container = requireModule('container')["default"];
     Container.set = set;
 
     __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"],
+  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/platform","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/injected_property","ember-metal/run_loop","ember-metal/watching","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
@@ -33620,32 +33751,32 @@ enifed("ember-runtime/system/core_object",
     // 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.
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var guidFor = __dependency4__.guidFor;
-    var apply = __dependency4__.apply;
-    var o_create = __dependency5__.create;
-    var generateGuid = __dependency4__.generateGuid;
-    var GUID_KEY = __dependency4__.GUID_KEY;
-    var meta = __dependency4__.meta;
-    var makeArray = __dependency4__.makeArray;
-    var rewatch = __dependency6__.rewatch;
-    var finishChains = __dependency7__.finishChains;
-    var sendEvent = __dependency8__.sendEvent;
-    var IS_BINDING = __dependency9__.IS_BINDING;
-    var Mixin = __dependency9__.Mixin;
-    var required = __dependency9__.required;
-    var indexOf = __dependency10__.indexOf;
-    var EmberError = __dependency11__["default"];
-    var o_defineProperty = __dependency5__.defineProperty;
-    var keys = __dependency12__["default"];
-    var ActionHandler = __dependency13__["default"];
-    var defineProperty = __dependency14__.defineProperty;
-    var Binding = __dependency15__.Binding;
-    var ComputedProperty = __dependency16__.ComputedProperty;
-    var run = __dependency17__["default"];
-    var destroy = __dependency6__.destroy;
+    var guidFor = __dependency3__.guidFor;
+    var apply = __dependency3__.apply;
+    var o_create = __dependency4__.create;
+    var generateGuid = __dependency3__.generateGuid;
+    var GUID_KEY = __dependency3__.GUID_KEY;
+    var meta = __dependency3__.meta;
+    var makeArray = __dependency3__.makeArray;
+    var finishChains = __dependency5__.finishChains;
+    var sendEvent = __dependency6__.sendEvent;
+    var IS_BINDING = __dependency7__.IS_BINDING;
+    var Mixin = __dependency7__.Mixin;
+    var required = __dependency7__.required;
+    var indexOf = __dependency8__.indexOf;
+    var EmberError = __dependency9__["default"];
+    var o_defineProperty = __dependency4__.defineProperty;
+    var keys = __dependency10__["default"];
+    var ActionHandler = __dependency11__["default"];
+    var defineProperty = __dependency12__.defineProperty;
+    var Binding = __dependency13__.Binding;
+    var ComputedProperty = __dependency14__.ComputedProperty;
+    var computed = __dependency14__.computed;
+    var InjectedProperty = __dependency15__["default"];
+    var run = __dependency16__["default"];
+    var destroy = __dependency17__.destroy;
     var K = __dependency1__.K;
-    var hasPropertyAccessors = __dependency5__.hasPropertyAccessors;
+    var hasPropertyAccessors = __dependency4__.hasPropertyAccessors;
 
     var schedule = run.schedule;
     var applyMixin = Mixin._apply;
@@ -33712,8 +33843,6 @@ enifed("ember-runtime/system/core_object",
 
             for (var j = 0, ll = keyNames.length; j < ll; j++) {
               var keyName = keyNames[j];
-              if (!properties.hasOwnProperty(keyName)) { continue; }
-
               var value = properties[keyName];
 
               if (IS_BINDING.test(keyName)) {
@@ -33729,7 +33858,9 @@ enifed("ember-runtime/system/core_object",
               var desc = m.descs[keyName];
 
                                           
-              if (concatenatedProperties && indexOf(concatenatedProperties, keyName) >= 0) {
+              if (concatenatedProperties && 
+                  concatenatedProperties.length > 0 &&
+                  indexOf(concatenatedProperties, keyName) >= 0) {
                 var baseValue = this[keyName];
 
                 if (baseValue) {
@@ -33787,7 +33918,6 @@ enifed("ember-runtime/system/core_object",
         if (!wasApplied) {
           wasApplied = true;
           Class.PrototypeMixin.applyPartial(Class.prototype);
-          rewatch(Class.prototype);
         }
 
         return this.prototype;
@@ -34040,7 +34170,7 @@ enifed("ember-runtime/system/core_object",
 
     CoreObject.__super__ = null;
 
-    var ClassMixin = Mixin.create({
+    var ClassMixinProps = {
 
       ClassMixin: required(),
 
@@ -34384,7 +34514,7 @@ enifed("ember-runtime/system/core_object",
                 return desc._meta || {};
       },
 
-      _computedProperties: Ember.computed(function() {
+      _computedProperties: computed(function() {
         hasCachedComputedProperties = true;
         var proto = this.proto();
         var descs = meta(proto).descs;
@@ -34424,7 +34554,10 @@ enifed("ember-runtime/system/core_object",
           callback.call(binding || this, property.name, property.meta || empty);
         }
       }
-    });
+    };
+
+    
+    var ClassMixin = Mixin.create(ClassMixinProps);
 
     ClassMixin.ownerConstructor = CoreObject;
 
@@ -34452,13 +34585,12 @@ enifed("ember-runtime/system/core_object",
     __exports__["default"] = CoreObject;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-runtime/mixins/deferred","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var DeferredMixin = __dependency2__["default"];
-    var get = __dependency3__.get;
-    var EmberObject = __dependency4__["default"];
+    var EmberObject = __dependency3__["default"];
 
     var Deferred = EmberObject.extend(DeferredMixin, {
       init: function() {
@@ -34477,8 +34609,8 @@ enifed("ember-runtime/system/deferred",
     __exports__["default"] = Deferred;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/property_get","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__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -34489,26 +34621,25 @@ enifed("ember-runtime/system/each_proxy",
     // Ember.assert
 
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var guidFor = __dependency4__.guidFor;
-    var forEach = __dependency5__.forEach;
-    var indexOf = __dependency6__.indexOf;
-    var EmberArray = __dependency7__["default"];
+    var guidFor = __dependency3__.guidFor;
+    var forEach = __dependency4__.forEach;
+    var indexOf = __dependency5__.indexOf;
+    var EmberArray = __dependency6__["default"];
     // ES6TODO: WAT? Circular dep?
-    var EmberObject = __dependency8__["default"];
-    var computed = __dependency9__.computed;
-    var addObserver = __dependency10__.addObserver;
-    var addBeforeObserver = __dependency10__.addBeforeObserver;
-    var removeBeforeObserver = __dependency10__.removeBeforeObserver;
-    var removeObserver = __dependency10__.removeObserver;
-    var typeOf = __dependency4__.typeOf;
-    var watchedEvents = __dependency11__.watchedEvents;
-    var defineProperty = __dependency12__.defineProperty;
-    var beginPropertyChanges = __dependency13__.beginPropertyChanges;
-    var propertyDidChange = __dependency13__.propertyDidChange;
-    var propertyWillChange = __dependency13__.propertyWillChange;
-    var endPropertyChanges = __dependency13__.endPropertyChanges;
-    var changeProperties = __dependency13__.changeProperties;
+    var EmberObject = __dependency7__["default"];
+    var computed = __dependency8__.computed;
+    var addObserver = __dependency9__.addObserver;
+    var addBeforeObserver = __dependency9__.addBeforeObserver;
+    var removeBeforeObserver = __dependency9__.removeBeforeObserver;
+    var removeObserver = __dependency9__.removeObserver;
+    var typeOf = __dependency3__.typeOf;
+    var watchedEvents = __dependency10__.watchedEvents;
+    var defineProperty = __dependency11__.defineProperty;
+    var beginPropertyChanges = __dependency12__.beginPropertyChanges;
+    var propertyDidChange = __dependency12__.propertyDidChange;
+    var propertyWillChange = __dependency12__.propertyWillChange;
+    var endPropertyChanges = __dependency12__.endPropertyChanges;
+    var changeProperties = __dependency12__.changeProperties;
 
     var EachArray = EmberObject.extend(EmberArray, {
 
@@ -34920,7 +35051,7 @@ enifed("ember-runtime/system/namespace",
 
     function findNamespaces() {
       var lookup = Ember.lookup;
-      var obj, isNamespace;
+      var obj;
 
       if (Namespace.PROCESSED) { return; }
 
@@ -35007,8 +35138,8 @@ 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__) {
+  ["ember-metal/core","ember-metal/property_get","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__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -35019,18 +35150,17 @@ enifed("ember-runtime/system/native_array",
     // Ember.EXTEND_PROTOTYPES
 
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    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 replace = __dependency3__._replace;
+    var forEach = __dependency3__.forEach;
+    var Mixin = __dependency4__.Mixin;
+    var indexOf = __dependency5__.indexOf;
+    var lastIndexOf = __dependency5__.lastIndexOf;
+    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
@@ -35185,16 +35315,19 @@ enifed("ember-runtime/system/native_array",
     __exports__["default"] = NativeArray;
   });
 enifed("ember-runtime/system/object",
-  ["ember-runtime/system/core_object","ember-runtime/mixins/observable","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+  ["ember-metal/core","ember-runtime/system/core_object","ember-runtime/mixins/observable","ember-runtime/inject","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
     @module ember
     @submodule ember-runtime
     */
 
-    var CoreObject = __dependency1__["default"];
-    var Observable = __dependency2__["default"];
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var CoreObject = __dependency2__["default"];
+    var Observable = __dependency3__["default"];
+    var validatePropertyInjections = __dependency4__.validatePropertyInjections;
 
     /**
       `Ember.Object` is the main base class for all Ember objects. It is a subclass
@@ -35211,6 +35344,12 @@ enifed("ember-runtime/system/object",
       return "Ember.Object";
     };
 
+    function injectedPropertyAssertion(props) {
+      // Injection validations are a debugging aid only, so ensure that they are
+      // not performed in production builds by invoking from an assertion
+          }
+
+    
     __exports__["default"] = EmberObject;
   });
 enifed("ember-runtime/system/object_proxy",
@@ -35291,6 +35430,18 @@ enifed("ember-runtime/system/object_proxy",
 
     __exports__["default"] = EmberObject.extend(_ProxyMixin);
   });
+enifed("ember-runtime/system/service",
+  ["ember-runtime/system/object","ember-runtime/inject","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Object = __dependency1__["default"];
+    var createInjectionHelper = __dependency2__.createInjectionHelper;
+
+    var Service;
+
+    
+    __exports__["default"] = Service;
+  });
 enifed("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__) {
@@ -35305,7 +35456,7 @@ enifed("ember-runtime/system/set",
     var get = __dependency2__.get;
     var set = __dependency3__.set;
     var guidFor = __dependency4__.guidFor;
-    var isNone = __dependency5__.isNone;
+    var isNone = __dependency5__["default"];
     var fmt = __dependency6__.fmt;
     var CoreObject = __dependency7__["default"];
     var MutableEnumerable = __dependency8__["default"];
@@ -35415,6 +35566,7 @@ enifed("ember-runtime/system/set",
       @uses Ember.Copyable
       @uses Ember.Freezable
       @since Ember 0.9
+      @deprecated
     */
     __exports__["default"] = CoreObject.extend(MutableEnumerable, Copyable, Freezable, {
 
@@ -36078,12 +36230,11 @@ enifed("ember-runtime/system/string",
     __exports__.capitalize = capitalize;
   });
 enifed("ember-runtime/system/subarray",
-  ["ember-metal/property_get","ember-metal/error","ember-metal/enumerable_utils","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/error","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var get = __dependency1__.get;
-    var EmberError = __dependency2__["default"];
-    var EnumerableUtils = __dependency3__["default"];
+    var EmberError = __dependency1__["default"];
+    var EnumerableUtils = __dependency2__["default"];
 
     var RETAIN = 'r';
     var FILTER = 'f';
@@ -36315,7 +36466,7 @@ enifed("ember-runtime/system/tracked_array",
         var arrayOperation = match.operation;
         var arrayOperationIndex = match.index;
         var arrayOperationRangeStart = match.rangeStart;
-        var composeIndex, splitIndex, splitItems, splitArrayOperation, newArrayOperation;
+        var composeIndex, newArrayOperation;
 
         newArrayOperation = new ArrayOperation(INSERT, count, newItems);
 
@@ -36348,7 +36499,6 @@ enifed("ember-runtime/system/tracked_array",
         if (count < 1) { return; }
 
         var match = this._findArrayOperation(index);
-        var arrayOperation = match.operation;
         var arrayOperationIndex = match.index;
         var arrayOperationRangeStart = match.rangeStart;
         var newArrayOperation, composeIndex;
@@ -36608,6 +36758,8 @@ enifed("ember-views",
     var Ember = __dependency1__["default"];
     var jQuery = __dependency2__["default"];
     var isSimpleClick = __dependency3__.isSimpleClick;
+    var getViewClientRects = __dependency3__.getViewClientRects;
+    var getViewBoundingClientRect = __dependency3__.getViewBoundingClientRect;
     var RenderBuffer = __dependency4__["default"];
      // for the side effect of extending Ember.run.queues
     var cloneStates = __dependency6__.cloneStates;
@@ -36638,6 +36790,8 @@ enifed("ember-views",
 
     var ViewUtils = Ember.ViewUtils = {};
     ViewUtils.isSimpleClick = isSimpleClick;
+    ViewUtils.getViewClientRects = getViewClientRects;
+    ViewUtils.getViewBoundingClientRect = getViewBoundingClientRect;
 
     Ember.CoreView = CoreView;
     Ember.View = View;
@@ -36720,15 +36874,12 @@ enifed("ember-views/mixins/component_template_deprecation",
     });
   });
 enifed("ember-views/mixins/view_target_action_support",
-  ["ember-metal/mixin","ember-runtime/mixins/target_action_support","ember-metal/computed","exports"],
+  ["ember-metal/mixin","ember-runtime/mixins/target_action_support","ember-metal/alias","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var Mixin = __dependency1__.Mixin;
     var TargetActionSupport = __dependency2__["default"];
-
-    // ES6TODO: computed should have its own export path so you can do import {defaultTo} from computed
-    var computed = __dependency3__.computed;
-    var alias = computed.alias;
+    var alias = __dependency3__["default"];
 
     /**
     `Ember.ViewTargetActionSupport` is a mixin that can be included in a
@@ -36782,6 +36933,205 @@ enifed("ember-views/mixins/view_target_action_support",
       actionContext: alias('context')
     });
   });
+enifed("ember-views/streams/context_stream",
+  ["ember-metal/core","ember-metal/merge","ember-metal/platform","ember-metal/path_cache","ember-metal/streams/stream","ember-metal/streams/simple","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+
+    var merge = __dependency2__["default"];
+    var create = __dependency3__.create;
+    var isGlobal = __dependency4__.isGlobal;
+    var Stream = __dependency5__["default"];
+    var SimpleStream = __dependency6__["default"];
+
+    function ContextStream(view) {
+            this.view = view;
+    }
+
+    ContextStream.prototype = create(Stream.prototype);
+
+    merge(ContextStream.prototype, {
+      value: function() {},
+
+      _makeChildStream: function(key, _fullPath) {
+        var stream;
+
+        if (key === '' || key === 'this') {
+          stream = this.view._baseContext;
+        } else if (isGlobal(key) && Ember.lookup[key]) {
+                    stream = new SimpleStream(Ember.lookup[key]);
+          stream._isGlobal = true;
+        } else if (key in this.view._keywords) {
+          stream = new SimpleStream(this.view._keywords[key]);
+        } else {
+          stream = new SimpleStream(this.view._baseContext.get(key));
+        }
+
+        stream._isRoot = true;
+
+        if (key === 'controller') {
+          stream._isController = true;
+        }
+
+        return stream;
+      }
+    });
+
+    __exports__["default"] = ContextStream;
+  });
+enifed("ember-views/streams/key_stream",
+  ["ember-metal/core","ember-metal/merge","ember-metal/platform","ember-metal/property_get","ember-metal/property_set","ember-metal/observer","ember-metal/streams/stream","ember-metal/streams/read","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+
+    var merge = __dependency2__["default"];
+    var create = __dependency3__.create;
+    var get = __dependency4__.get;
+    var set = __dependency5__.set;
+    var addObserver = __dependency6__.addObserver;
+    var removeObserver = __dependency6__.removeObserver;
+    var Stream = __dependency7__["default"];
+    var read = __dependency8__.read;
+
+    function KeyStream(source, key) {
+            
+      this.source = source;
+      this.obj = undefined;
+      this.key = key;
+
+      if (source && source.isStream) {
+        source.subscribe(this._didChange, this);
+      }
+    }
+
+    KeyStream.prototype = create(Stream.prototype);
+
+    merge(KeyStream.prototype, {
+      valueFn: function() {
+        var prevObj = this.obj;
+        var nextObj = read(this.source);
+
+        if (nextObj !== prevObj) {
+          if (prevObj && typeof prevObj === 'object') {
+            removeObserver(prevObj, this.key, this, this._didChange);
+          }
+
+          if (nextObj && typeof nextObj === 'object') {
+            addObserver(nextObj, this.key, this, this._didChange);
+          }
+
+          this.obj = nextObj;
+        }
+
+        if (nextObj) {
+          return get(nextObj, this.key);
+        }
+      },
+
+      setValue: function(value) {
+        if (this.obj) {
+          set(this.obj, this.key, value);
+        }
+      },
+
+      setSource: function(nextSource) {
+        
+        var prevSource = this.source;
+
+        if (nextSource !== prevSource) {
+          if (prevSource && prevSource.isStream) {
+            prevSource.unsubscribe(this._didChange, this);
+          }
+
+          if (nextSource && nextSource.isStream) {
+            nextSource.subscribe(this._didChange, this);
+          }
+
+          this.source = nextSource;
+          this.notify();
+        }
+      },
+
+      _didChange: function() {
+        this.notify();
+      },
+
+      destroy: function() {
+        if (this.source && this.source.isStream) {
+          this.source.unsubscribe(this._didChange, this);
+        }
+
+        if (this.obj && typeof this.obj === 'object') {
+          removeObserver(this.obj, this.key, this, this._didChange);
+        }
+
+        this.source = undefined;
+        this.obj = undefined;
+
+        Stream.prototype.destroy.call(this);
+      }
+    });
+
+    __exports__["default"] = KeyStream;
+
+    // The transpiler does not resolve cycles, so we export
+    // the `_makeChildStream` method onto `Stream` here.
+
+    Stream.prototype._makeChildStream = function(key) {
+      return new KeyStream(this, key);
+    };
+  });
+enifed("ember-views/streams/read",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/path_cache","ember-runtime/system/string","ember-metal/streams/read","ember-views/views/view","ember-runtime/mixins/controller","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+    "use strict";
+    var Ember = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var isGlobal = __dependency3__.isGlobal;
+    var fmt = __dependency4__.fmt;
+    var read = __dependency5__.read;
+    var View = __dependency6__["default"];
+    var ControllerMixin = __dependency7__["default"];
+
+    function readViewFactory(object, container) {
+      var value = read(object);
+      var viewClass;
+
+      if (typeof value === 'string') {
+        if (isGlobal(value)) {
+          viewClass = get(null, value);
+                  } else {
+                    viewClass = container.lookupFactory('view:'+value);
+        }
+      } else {
+        viewClass = value;
+      }
+
+      
+      return viewClass;
+    }
+
+    __exports__.readViewFactory = readViewFactory;function readUnwrappedModel(object) {
+      if (object && object.isStream) {
+        var result = object.value();
+
+        // If the path is exactly `controller` then we don't unwrap it.
+        if (!object._isController) {
+          while (ControllerMixin.detect(result)) {
+            result = get(result, 'model');
+          }
+        }
+
+        return result;
+      } else {
+        return object;
+      }
+    }
+
+    __exports__.readUnwrappedModel = readUnwrappedModel;
+  });
 enifed("ember-views/system/action_manager",
   ["exports"],
   function(__exports__) {
@@ -36817,7 +37167,7 @@ enifed("ember-views/system/event_dispatcher",
 
     var get = __dependency2__.get;
     var set = __dependency3__.set;
-    var isNone = __dependency4__.isNone;
+    var isNone = __dependency4__["default"];
     var run = __dependency5__["default"];
     var typeOf = __dependency6__.typeOf;
     var fmt = __dependency7__.fmt;
@@ -37038,7 +37388,7 @@ enifed("ember-views/system/event_dispatcher",
       },
 
       _bubbleEvent: function(view, evt, eventName) {
-        return run(view, view.handleEvent, eventName, evt);
+        return run.join(view, view.handleEvent, eventName, evt);
       },
 
       destroy: function() {
@@ -37066,20 +37416,18 @@ enifed("ember-views/system/ext",
     // Add a new named queue for rendering views that happens
     // after bindings have synced, and a queue for scheduling actions
     // that that should occur after view rendering.
-    var queues = run.queues;
     run._addQueue('render', 'actions');
     run._addQueue('afterRender', 'render');
   });
 enifed("ember-views/system/jquery",
-  ["ember-metal/core","ember-runtime/system/string","ember-metal/enumerable_utils","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+  ["ember-metal/core","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert
-    var w = __dependency2__.w;
 
     // ES6TODO: the functions on EnumerableUtils need their own exports
-    var forEach = __dependency3__.forEach;
+    var forEach = __dependency2__.forEach;
 
     /**
     Ember Views
@@ -37102,12 +37450,22 @@ enifed("ember-views/system/jquery",
     */
     if (jQuery) {
       // http://www.whatwg.org/specs/web-apps/current-work/multipage/dnd.html#dndevents
-      var dragEvents = w('dragstart drag dragenter dragleave dragover drop dragend');
+      var dragEvents = [
+        'dragstart',
+        'drag',
+        'dragenter',
+        'dragleave',
+        'dragover',
+        'drop',
+        'dragend'
+      ];
 
       // Copies the `dataTransfer` property from a browser event object onto the
       // jQuery event object for the specified events
       forEach(dragEvents, function(eventName) {
-        jQuery.event.fixHooks[eventName] = { props: ['dataTransfer'] };
+        jQuery.event.fixHooks[eventName] = {
+          props: ['dataTransfer']
+        };
       });
     }
 
@@ -37184,10 +37542,6 @@ enifed("ember-views/system/render_buffer",
         this.seen[string] = true;
 
         this.list.push(string);
-      },
-
-      toDOM: function() {
-        return this.list.join(" ");
       }
     };
 
@@ -37715,25 +38069,12 @@ enifed("ember-views/system/renderer",
 
     function EmberRenderer() {
       this.buffer = renderBuffer();
-      Renderer.call(this);
+      this._super$constructor();
     }
+
     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._super$constructor = Renderer;
 
     EmberRenderer.prototype.scheduleRender =
       function EmberRenderer_scheduleRender(ctx, fn) {
@@ -37745,25 +38086,6 @@ enifed("ember-views/system/renderer",
         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,
@@ -37803,10 +38125,6 @@ enifed("ember-views/system/renderer",
 
         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
@@ -37887,11 +38205,55 @@ enifed("ember-views/system/utils",
       return !modifier && !secondaryClick;
     }
 
-    __exports__.isSimpleClick = isSimpleClick;
+    __exports__.isSimpleClick = isSimpleClick;/**
+      @private
+      @method getViewRange
+      @param {Ember.View} view
+    */
+    function getViewRange(view) {
+      var range = document.createRange();
+      range.setStartAfter(view._morph.start);
+      range.setEndBefore(view._morph.end);
+      return range;
+    }
+
+    /**
+      `getViewClientRects` provides information about the position of the border
+      box edges of a view relative to the viewport.
+
+      It is only intended to be used by development tools like the Ember Inpsector
+      and may not work on older browsers.
+
+      @private
+      @method getViewClientRects
+      @param {Ember.View} view
+    */
+    function getViewClientRects(view) {
+      var range = getViewRange(view);
+      return range.getClientRects();
+    }
+
+    __exports__.getViewClientRects = getViewClientRects;/**
+      `getViewBoundingClientRect` provides information about the position of the
+      bounding border box edges of a view relative to the viewport.
+
+      It is only intended to be used by development tools like the Ember Inpsector
+      and may not work on older browsers.
+
+      @private
+      @method getViewBoundingClientRect
+      @param {Ember.View} view
+    */
+    function getViewBoundingClientRect(view) {
+      var range = getViewRange(view);
+      return range.getBoundingClientRect();
+    }
+
+    __exports__.getViewBoundingClientRect = getViewBoundingClientRect;
   });
 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__) {
+  ["ember-metal/core","ember-metal/binding","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-views/streams/read","ember-runtime/mixins/array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
 
     /**
@@ -37901,19 +38263,17 @@ enifed("ember-views/views/collection_view",
 
     var Ember = __dependency1__["default"];
     // Ember.assert
-    var create = __dependency2__.create;
-    var isGlobalPath = __dependency3__.isGlobalPath;
-    var merge = __dependency4__["default"];
-    var get = __dependency5__.get;
-    var set = __dependency6__.set;
-    var fmt = __dependency7__.fmt;
-    var ContainerView = __dependency8__["default"];
-    var CoreView = __dependency9__["default"];
-    var View = __dependency10__["default"];
-    var observer = __dependency11__.observer;
-    var beforeObserver = __dependency11__.beforeObserver;
-    var handlebarsGetView = __dependency12__.handlebarsGetView;
-    var EmberArray = __dependency13__["default"];
+    var isGlobalPath = __dependency2__.isGlobalPath;
+    var get = __dependency3__.get;
+    var set = __dependency4__.set;
+    var fmt = __dependency5__.fmt;
+    var ContainerView = __dependency6__["default"];
+    var CoreView = __dependency7__["default"];
+    var View = __dependency8__["default"];
+    var observer = __dependency9__.observer;
+    var beforeObserver = __dependency9__.beforeObserver;
+    var readViewFactory = __dependency10__.readViewFactory;
+    var EmberArray = __dependency11__["default"];
 
     /**
       `Ember.CollectionView` is an `Ember.View` descendent responsible for managing
@@ -38238,21 +38598,23 @@ enifed("ember-views/views/collection_view",
       */
       arrayDidChange: function(content, start, removed, added) {
         var addedViews = [];
-        var view, item, idx, len, itemViewClass, emptyView;
+        var view, item, idx, len, itemViewClass, emptyView, itemViewProps;
 
         len = content ? get(content, 'length') : 0;
 
         if (len) {
+          itemViewProps = this._itemViewProps || {};
           itemViewClass = get(this, 'itemViewClass');
-          itemViewClass = handlebarsGetView(content, itemViewClass, this.container);
+
+          itemViewClass = readViewFactory(itemViewClass, this.container);
 
           for (idx = start; idx < start+added; idx++) {
             item = content.objectAt(idx);
 
-            view = this.createChildView(itemViewClass, {
-              content: item,
-              contentIndex: idx
-            });
+            itemViewProps.content = item;
+            itemViewProps.contentIndex = idx;
+
+            view = this.createChildView(itemViewClass, itemViewProps);
 
             addedViews.push(view);
           }
@@ -38266,6 +38628,7 @@ enifed("ember-views/views/collection_view",
           }
 
           emptyView = this.createChildView(emptyView);
+
           addedViews.push(emptyView);
           set(this, 'emptyView', emptyView);
 
@@ -38342,7 +38705,7 @@ enifed("ember-views/views/component",
 
     var get = __dependency5__.get;
     var set = __dependency6__.set;
-    var isNone = __dependency7__.isNone;
+    var isNone = __dependency7__["default"];
 
     var computed = __dependency8__.computed;
 
@@ -38448,7 +38811,6 @@ enifed("ember-views/views/component",
 
       init: function() {
         this._super();
-        set(this, 'origContext', get(this, 'context'));
         set(this, 'context', this);
         set(this, 'controller', this);
       },
@@ -38495,12 +38857,8 @@ enifed("ember-views/views/component",
       */
       templateName: null,
 
-      // during render, isolate keywords
-      cloneKeywords: function() {
-        return {
-          view: this,
-          controller: this
-        };
+      _setupKeywords: function() {
+        this._keywords.view.setSource(this);
       },
 
       _yield: function(context, options) {
@@ -38515,9 +38873,9 @@ enifed("ember-views/views/component",
             tagName: '',
             _contextView: parentView,
             template: template,
-            context: options.data.insideGroup ? get(this, 'origContext') : get(parentView, 'context'),
+            context: get(parentView, 'context'),
             controller: get(parentView, 'controller'),
-            templateData: { keywords: parentView.cloneKeywords(), insideGroup: options.data.insideGroup }
+            templateData: { keywords: {} }
           });
         }
       },
@@ -38633,14 +38991,36 @@ enifed("ember-views/views/component",
           action: actionName,
           actionContext: contexts
         });
+      },
+
+      send: function(actionName) {
+        var args = [].slice.call(arguments, 1);
+        var target;
+        var hasAction = this._actions && this._actions[actionName];
+
+        if (hasAction) {
+          if (this._actions[actionName].apply(this, args) === true) {
+            // handler returned true, so this action will bubble
+          } else {
+            return;
+          }
+        }
+
+        if (target = get(this, 'target')) {
+                    target.send.apply(target, arguments);
+        } else {
+          if (!hasAction) {
+            throw new Error(Ember.inspect(this) + ' had no action handler for: ' + actionName);
+          }
+        }
       }
     });
 
     __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__) {
+  ["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-metal/mixin","ember-runtime/system/native_array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert, Ember.K
@@ -38662,10 +39042,9 @@ enifed("ember-views/views/container_view",
     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 observer = __dependency13__.observer;
+    var beforeObserver = __dependency13__.beforeObserver;
+    var emberA = __dependency14__.A;
 
     /**
     @module ember
@@ -38825,7 +39204,6 @@ enifed("ember-views/views/container_view",
       @extends Ember.View
     */
     var ContainerView = View.extend(MutableArray, {
-      isContainer: true,
       _states: states,
 
       willWatchProperty: function(prop){
@@ -38835,7 +39213,7 @@ enifed("ember-views/views/container_view",
         this._super();
 
         var childViews = get(this, 'childViews');
-
+        
         // redefine view's childViews property that was obliterated
         defineProperty(this, 'childViews', View.childViewsProperty);
 
@@ -38899,6 +39277,18 @@ enifed("ember-views/views/container_view",
         @param {Ember.RenderBuffer} buffer the buffer to render to
       */
       render: function(buffer) {
+        var element = buffer.element();
+        var dom = buffer.dom;
+
+        if (this.tagName === '') {
+          element = dom.createDocumentFragment();
+          buffer._element = element;
+          this._childViewsMorph = dom.appendMorph(element, this._morph.contextualElement);
+        } else {
+          this._childViewsMorph = dom.createMorph(element, element.lastChild, null);
+        }
+
+        return element;
       },
 
       instrumentName: 'container',
@@ -39007,7 +39397,9 @@ enifed("ember-views/views/container_view",
     merge(states.hasElement, {
       childViewsWillChange: function(view, views, start, removed) {
         for (var i=start; i<start+removed; i++) {
-          views[i].remove();
+          var _view = views[i];
+          _view._unsubscribeFromStreamBindings();
+          _view.remove();
         }
       },
 
@@ -39032,8 +39424,8 @@ enifed("ember-views/views/container_view",
     __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__) {
+  ["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/computed","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
     var Rerender = __dependency1__["default"];
 
@@ -39044,13 +39436,9 @@ enifed("ember-views/views/core_view",
     var ActionHandler = __dependency5__["default"];
 
     var get = __dependency6__.get;
-    var set = __dependency7__.set;
-    var computed = __dependency8__.computed;
-
-    var typeOf = __dependency9__.typeOf;
-
-    var instrument = __dependency10__.instrument;
+    var computed = __dependency7__.computed;
 
+    var typeOf = __dependency8__.typeOf;
     /**
       `Ember.CoreView` is an abstract class that exists to give view-like behavior
       to both Ember's main view class `Ember.View` and other classes like
@@ -39069,7 +39457,6 @@ enifed("ember-views/views/core_view",
     var CoreView = EmberObject.extend(Evented, ActionHandler, {
       isView: true,
       isVirtual: false,
-      isContainer: false,
 
       _states: cloneStates(states),
 
@@ -39216,15 +39603,12 @@ enifed("ember-views/views/states",
     __exports__.states = states;
   });
 enifed("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__) {
+  ["ember-metal/core","ember-metal/error","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.K
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var run = __dependency4__["default"];
-    var EmberError = __dependency5__["default"];
+    var EmberError = __dependency2__["default"];
 
     /**
     @module ember
@@ -39292,8 +39676,8 @@ enifed("ember-views/views/states/destroying",
     __exports__["default"] = destroying;
   });
 enifed("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__) {
+  ["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","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     var _default = __dependency1__["default"];
     var run = __dependency2__["default"];
@@ -39308,7 +39692,6 @@ enifed("ember-views/views/states/has_element",
     */
 
     var get = __dependency7__.get;
-    var set = __dependency8__.set;
 
     var hasElement = create(_default);
 
@@ -39472,13 +39855,11 @@ enifed("ember-views/views/states/in_dom",
     __exports__["default"] = inDOM;
   });
 enifed("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__) {
+  ["ember-views/views/states/default","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var _default = __dependency1__["default"];
     var create = __dependency2__.create;
-    var merge = __dependency3__["default"];
-    var jQuery = __dependency4__["default"];
 
     /**
     @module ember
@@ -39489,57 +39870,58 @@ enifed("ember-views/views/states/pre_render",
     __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"],
-  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__) {
+  ["ember-metal/core","ember-metal/platform","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/streams/simple","ember-views/streams/key_stream","ember-metal/streams/stream_binding","ember-views/streams/context_stream","ember-metal/is_none","ember-metal/deprecate_property","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_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__, __dependency27__, __exports__) {
     "use strict";
     // Ember.assert, Ember.deprecate, Ember.warn, Ember.TEMPLATES,
     // Ember.K, jQuery, Ember.lookup,
     // Ember.ContainerView circular dependency
     // Ember.ENV
     var Ember = __dependency1__["default"];
+    var create = __dependency2__.create;
 
-    var Evented = __dependency2__["default"];
-    var EmberObject = __dependency3__["default"];
-    var EmberError = __dependency4__["default"];
-    var get = __dependency5__.get;
-    var set = __dependency6__.set;
-    var setProperties = __dependency7__["default"];
-    var run = __dependency8__["default"];
-    var addObserver = __dependency9__.addObserver;
-    var removeObserver = __dependency9__.removeObserver;
+    var Evented = __dependency3__["default"];
+    var EmberObject = __dependency4__["default"];
+    var EmberError = __dependency5__["default"];
+    var get = __dependency6__.get;
+    var set = __dependency7__.set;
+    var setProperties = __dependency8__["default"];
+    var run = __dependency9__["default"];
+    var addObserver = __dependency10__.addObserver;
+    var removeObserver = __dependency10__.removeObserver;
+    var defineProperty = __dependency11__.defineProperty;
+    var guidFor = __dependency12__.guidFor;
+    var computed = __dependency13__.computed;
+    var observer = __dependency14__.observer;
+    var SimpleStream = __dependency15__["default"];
+    var KeyStream = __dependency16__["default"];
+    var StreamBinding = __dependency17__["default"];
+    var ContextStream = __dependency18__["default"];
 
-    var defineProperty = __dependency10__.defineProperty;
-    var deprecateProperty = __dependency10__.deprecateProperty;
-    var guidFor = __dependency11__.guidFor;
-    var meta = __dependency11__.meta;
-    var computed = __dependency12__.computed;
-    var observer = __dependency13__.observer;
+    var typeOf = __dependency12__.typeOf;
+    var isArray = __dependency12__.isArray;
+    var isNone = __dependency19__["default"];
+    var Mixin = __dependency14__.Mixin;
+    var deprecateProperty = __dependency20__.deprecateProperty;
+    var emberA = __dependency21__.A;
 
-    var typeOf = __dependency11__.typeOf;
-    var isArray = __dependency11__.isArray;
-    var isNone = __dependency14__.isNone;
-    var Mixin = __dependency13__.Mixin;
-    var deprecateProperty = __dependency15__.deprecateProperty;
-    var emberA = __dependency16__.A;
-
-    var dasherize = __dependency17__.dasherize;
+    var dasherize = __dependency22__.dasherize;
 
     // ES6TODO: functions on EnumerableUtils should get their own export
-    var forEach = __dependency18__.forEach;
-    var addObject = __dependency18__.addObject;
-    var removeObject = __dependency18__.removeObject;
+    var forEach = __dependency23__.forEach;
+    var addObject = __dependency23__.addObject;
+    var removeObject = __dependency23__.removeObject;
 
-    var beforeObserver = __dependency13__.beforeObserver;
-    var copy = __dependency19__["default"];
-    var isGlobalPath = __dependency20__.isGlobalPath;
+    var beforeObserver = __dependency14__.beforeObserver;
 
-    var propertyWillChange = __dependency21__.propertyWillChange;
-    var propertyDidChange = __dependency21__.propertyDidChange;
+    var propertyWillChange = __dependency24__.propertyWillChange;
+    var propertyDidChange = __dependency24__.propertyDidChange;
 
-    var jQuery = __dependency22__["default"];
+    var jQuery = __dependency25__["default"];
      // for the side effect of extending Ember.run.queues
 
-    var CoreView = __dependency24__["default"];
+    var CoreView = __dependency27__["default"];
+
 
     /**
     @module ember
@@ -39548,7 +39930,6 @@ enifed("ember-views/views/view",
     var childViewsProperty = computed(function() {
       var childViews = this._childViews;
       var ret = emberA();
-      var view = this;
 
       forEach(childViews, function(view) {
         var currentChildViews;
@@ -40479,6 +40860,7 @@ enifed("ember-views/views/view",
       _parentViewDidChange: observer('_parentView', function() {
         if (this.isDestroying) { return; }
 
+        this._setupKeywords();
         this.trigger('parentViewDidChange');
 
         if (get(this, 'parentView.controller') && !get(this, 'controller')) {
@@ -40496,15 +40878,22 @@ enifed("ember-views/views/view",
         });
       }),
 
-      cloneKeywords: function() {
-        var templateData = get(this, 'templateData');
+      _setupKeywords: function() {
+        var keywords = this._keywords;
+        var contextView = this._contextView || this._parentView;
 
-        var keywords = templateData ? copy(templateData.keywords) : {};
-        set(keywords, 'view', this.isVirtual ? keywords.view : this);
-        set(keywords, '_view', this);
-        set(keywords, 'controller', get(this, 'controller'));
+        if (contextView) {
+          var parentKeywords = contextView._keywords;
 
-        return keywords;
+          keywords.view.setSource(this.isVirtual ? parentKeywords.view : this);
+
+          for (var name in parentKeywords) {
+            if (keywords[name]) continue;
+            keywords[name] = parentKeywords[name];
+          }
+        } else {
+          keywords.view.setSource(this.isVirtual ? null : this);
+        }
       },
 
       /**
@@ -40527,15 +40916,12 @@ enifed("ember-views/views/view",
 
         if (template) {
           var context = get(this, 'context');
-          var keywords = this.cloneKeywords();
           var output;
 
           var data = {
             view: this,
             buffer: buffer,
-            isRenderData: true,
-            keywords: keywords,
-            insideGroup: get(this, 'templateData.insideGroup')
+            isRenderData: true
           };
 
           // Invoke the template with the provided template context, which
@@ -40590,19 +40976,29 @@ enifed("ember-views/views/view",
         // ('content.isUrgent')
         forEach(classBindings, function(binding) {
 
-          
+          var parsedPath;
+
+          if (typeof binding === 'string') {
+                        parsedPath = View._parsePropertyPath(binding);
+            if (parsedPath.path === '') {
+              parsedPath.stream = new SimpleStream(true);
+            } else {
+              parsedPath.stream = this.getStream('_view.' + parsedPath.path);
+            }
+          } else {
+            parsedPath = binding;
+          }
+
           // Variable in which the old class value is saved. The observer function
           // closes over this variable, so it knows which string to remove when
           // the property changes.
           var oldClass;
-          // Extract just the property name from bindings like 'foo:bar'
-          var parsedPath = View._parsePropertyPath(binding);
 
           // Set up an observer on the context. If the property changes, toggle the
           // class name.
-          var observer = function() {
+          var observer = this._wrapAsScheduled(function() {
             // Get the current value of the property
-            newClass = this._classStringForProperty(binding);
+            newClass = this._classStringForProperty(parsedPath);
             elem = this.$();
 
             // If we had previously added a class to the element, remove it.
@@ -40621,10 +41017,10 @@ enifed("ember-views/views/view",
             } else {
               oldClass = null;
             }
-          };
+          });
 
           // Get the class name for the property at its current value
-          dasherizedClass = this._classStringForProperty(binding);
+          dasherizedClass = this._classStringForProperty(parsedPath);
 
           if (dasherizedClass) {
             // Ensure that it gets into the classNames array
@@ -40637,7 +41033,7 @@ enifed("ember-views/views/view",
             oldClass = dasherizedClass;
           }
 
-          this.registerObserver(this, parsedPath.path, observer);
+          parsedPath.stream.subscribe(observer, this);
           // Remove className so when the view is rerendered,
           // the className is added based on binding reevaluation
           this.one('willClearRender', function() {
@@ -40736,16 +41132,8 @@ enifed("ember-views/views/view",
         @param property
         @private
       */
-      _classStringForProperty: function(property) {
-        var parsedPath = View._parsePropertyPath(property);
-        var path = parsedPath.path;
-
-        var val = get(this, path);
-        if (val === undefined && isGlobalPath(path)) {
-          val = get(Ember.lookup, path);
-        }
-
-        return View._classStringForValue(path, val, parsedPath.className, parsedPath.falsyClassName);
+      _classStringForProperty: function(parsedPath) {
+        return View._classStringForValue(parsedPath.path, parsedPath.stream.value(), parsedPath.className, parsedPath.falsyClassName);
       },
 
       // ..........................................................
@@ -41177,6 +41565,17 @@ enifed("ember-views/views/view",
 
         // setup child views. be sure to clone the child views array first
         this._childViews = this._childViews.slice();
+        this._baseContext = undefined;
+        this._contextStream = undefined;
+        this._streamBindings = undefined;
+
+        if (!this._keywords) {
+          this._keywords = create(null);
+        }
+        this._keywords.view = new SimpleStream();
+        this._keywords._view = this;
+        this._keywords.controller = new KeyStream(this, 'controller');
+        this._setupKeywords();
 
                 this.classNameBindings = emberA(this.classNameBindings.slice());
 
@@ -41257,11 +41656,9 @@ 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;
 
         if (!this._super()) { return; }
 
@@ -41439,22 +41836,78 @@ 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 scheduledObserver = this._wrapAsScheduled(observer);
 
         addObserver(root, path, target, scheduledObserver);
 
         this.one('willClearRender', function() {
           removeObserver(root, path, target, scheduledObserver);
         });
-      }
+      },
 
+      _wrapAsScheduled: function(fn) {
+        var view = this;
+        var stateCheckedFn = function() {
+          view.currentState.invokeObserver(this, fn);
+        };
+        var scheduledFn = function() {
+          run.scheduleOnce('render', this, stateCheckedFn);
+        };
+        return scheduledFn;
+      },
+
+      getStream: function(path) {
+        return this._getContextStream().get(path);
+      },
+
+      _getBindingForStream: function(path) {
+        if (this._streamBindings === undefined) {
+          this._streamBindings = create(null);
+          this.one('willDestroyElement', this, this._destroyStreamBindings);
+        }
+
+        if (this._streamBindings[path] !== undefined) {
+          return this._streamBindings[path];
+        } else {
+          var stream = this._getContextStream().get(path);
+          return this._streamBindings[path] = new StreamBinding(stream);
+        }
+      },
+
+      _destroyStreamBindings: function() {
+        var streamBindings = this._streamBindings;
+        for (var path in streamBindings) {
+          streamBindings[path].destroy();
+        }
+        this._streamBindings = undefined;
+      },
+
+      _getContextStream: function() {
+        if (this._contextStream === undefined) {
+          this._baseContext = new KeyStream(this, 'context');
+          this._contextStream = new ContextStream(this);
+          this.one('willDestroyElement', this, this._destroyContextStream);
+        }
+
+        return this._contextStream;
+      },
+
+      _destroyContextStream: function() {
+        this._baseContext.destroy();
+        this._baseContext = undefined;
+        this._contextStream.destroy();
+        this._contextStream = undefined;
+      },
+
+      _unsubscribeFromStreamBindings: function() {
+        for (var key in this._streamBindingSubscriptions) {
+          var streamBinding = this[key + 'Binding'];
+          var callback = this._streamBindingSubscriptions[key];
+          streamBinding.unsubscribe(callback);
+        }
+      }
     });
+
     deprecateProperty(View.prototype, 'state', '_state');
     deprecateProperty(View.prototype, 'states', '_states');
 
@@ -41485,10 +41938,6 @@ enifed("ember-views/views/view",
       // once the view has been inserted into the DOM, legal manipulations
       // are done on the DOM element.
 
-    function notifyMutationListeners() {
-      run.once(View, 'notifyMutationListeners');
-    }
-
     View.reopenClass({
 
       /**
@@ -41526,6 +41975,7 @@ enifed("ember-views/views/view",
         }
 
         return {
+          stream: undefined,
           path: propertyPath,
           classNames: classNames,
           className: (className === '') ? undefined : className,
@@ -44730,6 +45180,7 @@ enifed("router/transition",
 
       if (error) {
         this.promise = Promise.reject(error);
+        this.error = error;
         return;
       }
 
@@ -47973,4 +48424,4 @@ enifed("rsvp/utils",
   });
 requireModule("ember");
 
-})();
+})();
\ No newline at end of file