make the tests pass!
Merge branch 'ipns-dev' of github.com:jbenet/go-ipfs into ipns-dev