Adds post-merge hook
Merge branch 'master' of https://github.com/LawrenceJones/dotfiles