Update README.md with better instructions for pulling in upstream changes

Test Plan: Craig and I just went through roughly these steps together.

Reviewers: csilvers

Subscribers: dylan

Differential Revision: http://phabricator.khanacademy.org/D13695