make tests pass on OS X
Merge branch 'huge-rewrite' of github.com:Strider-CD/strider-simple-worker into huge-rewrite