BLD: update merge script to update on github
@jreback @TomAugspurger This adds the ability to checkout a PR, do a small fixup or rebase, and push changes to github. 
I now added it as an additional question whether to update or merge, but can also make to separate scripts of it for convenience.