Add note about updating ember from master

I saw #127 just needed a merge conflict fixed, so I did that and opened this PR with the merge fix.  Is that helpful?