Merge branch 'master' of https://github.com/drennalls/superzippy

* This is done to fix the author of Drennalls's commit message. A
  rebase proved to be too hairy.