rollback api changes for ember
Merge branch 'master' of github.com:emberjs/website