fix merge issues
fix merge issues

For some reason the code from commit 9e53a5d was on the master branch.
I thought I was developing on 'scott', and when I committed, I merged
instead of undoing that mistake. And in the merge, I screwed a couple
of things up. This commit should fix that.

burp-hash/burp-hash