.gitconfig: Add alias to merge GitHub pull request

Ref. https://help.github.com/articles/checking-out-pull-requests-locally

Closes #422.
Brewfile: add some CTF tools

See https://github.com/ctfs/write-ups for more info.
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Brewfile: add some CTF tools
  .gitconfig: Add alias to merge GitHub pull request