Simpler way to pull upstream changes, with optional rebase for advanced git users.
Merge pull request #239 from audreyr/fix-contributor-instructions

Simpler way to pull upstream changes, with optional rebase for advanced ...