Merge branch 'master' of https://github.com/makoshark/redirect-tools

Benjamin Mako Hill || Want to submit a patch?