Fixing merge mistakes in model.
Merge branch 'lazy-bubbling' of github.com:bitovi/canjs into lazy-bubbling