Add a script for facilitating pull-request merging

This takes a branch and rebases it on top of the latest HEAD of origin's
master branch, force-pushing the branch if successful. It is useful to
do this before merging pull requests so that crossed lines do not result
in the commit graph.
Configure zsh to use Vi-style line editing instead of Emacs