BROKEN: I MERGED G's stuff into mine though
SAVING FOR G: TRIM
Merge branch 'master' of github.com:jontonsoup/kademlia-secure