refactoring to prep for a nodejs worker branch
Merge branch 'master' of https://github.com/Sinewyk/DERP