Remove post-merge hook

This doesn't get the pre/post merge refs, and so isn't compatible with
the post-checkout hook.
Merge branch 'master' of https://github.com/ithinkihaveacat/dotfiles