Added fail() method to PromiseProxyMixin. See here for an example why we should have this: https://github.com/emberjs/data/issues/1523#issuecomment-29362696
Added `promiseAlias()` function to allow for incoming `catch` and `finally`
Merge branch 'master' of github.com:aexmachina/ember.js

* 'master' of github.com:aexmachina/ember.js:
  [DOC] Adds needs docs for nested controller
  [Bugfix beta] container.has should not cause injections to be run.
  changes error message
  restore sync assertions. This will hopefully help in failure scenarios, and prevent aging.
  use @wycats amd micro-loader, which supports relative paths
  remove unnecessary uses of `call` / `apply`
  Added warning when using deprecated helpers and removed bindAttr/linkTo references
  [FEATURE with-controller] {{#with}} can take a controller= option
  Adds docs for templateName