you probably want to rebase against master, a good chunk of this has changed.