Merge pull request #32 from emberjs-cn/master

Update to 1.0.0-rc.6.1 - fixes #30 and #31
Update Makefile accordingly
Updated to ember 1.0.0-rc.7