honestly, if the rebase was messed up, you might just copy/paste your
changes in over top of current pydata/master. It's probably just one or two
big blocks of text, right? might be faster at this point.