Fix #35. Fix #34.

If we `git pull --rebase` up front, should fix both.