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

...git users.

@dbrgn, could you please review this?

(sorry about those lines removing trailing spaces -- I'll configure my editor not to do that in the future, but I figure it's fine for this one since it's just docs.)