Upgrade ember to 1.7.0
Merge pull request #1729 from jakecraige/patch-5

Upgrade ember to 1.7.0