`git pull` will only fetch from the origin.  In this case, the "official" repo is the remote named `upstream`.  You have to fetch it.  I can see rebase is better...  So something like this should be the "best" then, right?

```bash
$ git fetch upstream
$ get rebase upstream/master
```

The GitHub help is pretty [explicit](https://help.github.com/articles/syncing-a-fork) on [these things](https://help.github.com/articles/fork-a-repo) (which is where I was taking most of it from).  I am not saying it is right, but I can't seem to find another way to pull in upstream changes without using `fetch`.