Added two more renderTemplate statements that break
Merge remote-tracking branch 'upstream/new-router-api' into new-router-api
Updated to Ember.js release candidate 1.  Nothing is guaranteed to work