Reorged imports from jbenet/go-ipfs to ipfs/go-ipfs

- Modified Godeps/Godeps.json by hand
- [TEST] Updated welcome docs hash to sharness
- [TEST] Updated contact doc
- [TEST] disabled breaking test (t0080-repo refs local)

blocks_test.go

@@ -5,14 +5,14 @@ import (
 	"testing"
 	"time"
 
-	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
-	dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
-	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	blocks "github.com/jbenet/go-ipfs/blocks"
-	blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
-	blocksutil "github.com/jbenet/go-ipfs/blocks/blocksutil"
-	offline "github.com/jbenet/go-ipfs/exchange/offline"
-	u "github.com/jbenet/go-ipfs/util"
+	ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
+	dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
+	"github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	blocks "github.com/ipfs/go-ipfs/blocks"
+	blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
+	blocksutil "github.com/ipfs/go-ipfs/blocks/blocksutil"
+	offline "github.com/ipfs/go-ipfs/exchange/offline"
+	u "github.com/ipfs/go-ipfs/util"
 )
 
 func TestBlocks(t *testing.T) {

blockservice.go

@@ -7,12 +7,12 @@ import (
 	"errors"
 	"fmt"
 
-	context "github.com/jbenet/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
-	blocks "github.com/jbenet/go-ipfs/blocks"
-	"github.com/jbenet/go-ipfs/blocks/blockstore"
-	worker "github.com/jbenet/go-ipfs/blockservice/worker"
-	exchange "github.com/jbenet/go-ipfs/exchange"
-	u "github.com/jbenet/go-ipfs/util"
+	context "github.com/ipfs/go-ipfs/Godeps/_workspace/src/golang.org/x/net/context"
+	blocks "github.com/ipfs/go-ipfs/blocks"
+	"github.com/ipfs/go-ipfs/blocks/blockstore"
+	worker "github.com/ipfs/go-ipfs/blockservice/worker"
+	exchange "github.com/ipfs/go-ipfs/exchange"
+	u "github.com/ipfs/go-ipfs/util"
 )
 
 var wc = worker.Config{

mock.go

@@ -3,10 +3,10 @@ package blockservice
 import (
 	"testing"
 
-	bitswap "github.com/jbenet/go-ipfs/exchange/bitswap"
-	tn "github.com/jbenet/go-ipfs/exchange/bitswap/testnet"
-	mockrouting "github.com/jbenet/go-ipfs/routing/mock"
-	delay "github.com/jbenet/go-ipfs/thirdparty/delay"
+	bitswap "github.com/ipfs/go-ipfs/exchange/bitswap"
+	tn "github.com/ipfs/go-ipfs/exchange/bitswap/testnet"
+	mockrouting "github.com/ipfs/go-ipfs/routing/mock"
+	delay "github.com/ipfs/go-ipfs/thirdparty/delay"
 )
 
 // Mocks returns |n| connected mock Blockservices

worker/bench/main.go

@@ -6,14 +6,14 @@ import (
 	"testing"
 	"time"
 
-	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
-	ds_sync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
-	blocks "github.com/jbenet/go-ipfs/blocks"
-	blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
-	worker "github.com/jbenet/go-ipfs/blockservice/worker"
-	"github.com/jbenet/go-ipfs/exchange/offline"
-	"github.com/jbenet/go-ipfs/thirdparty/delay"
-	"github.com/jbenet/go-ipfs/util/datastore2"
+	ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
+	ds_sync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
+	blocks "github.com/ipfs/go-ipfs/blocks"
+	blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
+	worker "github.com/ipfs/go-ipfs/blockservice/worker"
+	"github.com/ipfs/go-ipfs/exchange/offline"
+	"github.com/ipfs/go-ipfs/thirdparty/delay"
+	"github.com/ipfs/go-ipfs/util/datastore2"
 )
 
 const kEstRoutingDelay = time.Second

worker/bench_worker_test.go

@@ -3,11 +3,11 @@ package worker
 import (
 	"testing"
 
-	ds "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
-	dssync "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
-	blocks "github.com/jbenet/go-ipfs/blocks"
-	blockstore "github.com/jbenet/go-ipfs/blocks/blockstore"
-	"github.com/jbenet/go-ipfs/exchange/offline"
+	ds "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore"
+	dssync "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-datastore/sync"
+	blocks "github.com/ipfs/go-ipfs/blocks"
+	blockstore "github.com/ipfs/go-ipfs/blocks/blockstore"
+	"github.com/ipfs/go-ipfs/exchange/offline"
 )
 
 func BenchmarkHandle10KBlocks(b *testing.B) {

worker/worker.go

@@ -6,12 +6,12 @@ import (
 	"errors"
 	"time"
 
-	process "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
-	ratelimit "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/ratelimit"
-	blocks "github.com/jbenet/go-ipfs/blocks"
-	exchange "github.com/jbenet/go-ipfs/exchange"
-	waitable "github.com/jbenet/go-ipfs/thirdparty/waitable"
-	util "github.com/jbenet/go-ipfs/util"
+	process "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess"
+	ratelimit "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/goprocess/ratelimit"
+	blocks "github.com/ipfs/go-ipfs/blocks"
+	exchange "github.com/ipfs/go-ipfs/exchange"
+	waitable "github.com/ipfs/go-ipfs/thirdparty/waitable"
+	util "github.com/ipfs/go-ipfs/util"
 )
 
 var log = util.Logger("blockservice")

worker/worker_test.go

 package worker
 
 import (
-	blocks "github.com/jbenet/go-ipfs/blocks"
+	blocks "github.com/ipfs/go-ipfs/blocks"
 	"testing"
 )