changing `git pull` to `git pull --rebase` ...

... on the advice of cweyl