Add note about updating ember from master
Merge remote-tracking branch 'origin/master' into patch-1

Conflicts:
	[resolved] README.md
Merge pull request #162 from knewter/patch-1

Add note about updating ember from master