update imports to point to vendored repos

convert.go

@@ -5,8 +5,8 @@ import (
 	"net"
 	"strings"
 
-	utp "github.com/h2so5/utp"
-	ma "github.com/jbenet/go-multiaddr"
+	utp "github.com/jbenet/go-multiaddr-net/Godeps/_workspace/src/github.com/h2so5/utp"
+	ma "github.com/jbenet/go-multiaddr-net/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 var errIncorrectNetAddr = fmt.Errorf("incorrect network addr conversion")

convert_test.go

@@ -4,8 +4,8 @@ import (
 	"net"
 	"testing"
 
-	utp "github.com/h2so5/utp"
-	ma "github.com/jbenet/go-multiaddr"
+	utp "github.com/jbenet/go-multiaddr-net/Godeps/_workspace/src/github.com/h2so5/utp"
+	ma "github.com/jbenet/go-multiaddr-net/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 type GenFunc func() (ma.Multiaddr, error)

ip.go

@@ -3,7 +3,7 @@ package manet
 import (
 	"bytes"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "github.com/jbenet/go-multiaddr-net/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 // Loopback Addresses

multiaddr/multiaddr.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "github.com/jbenet/go-multiaddr-net/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	manet "github.com/jbenet/go-multiaddr-net"
 )
 

net.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"net"
 
-	utp "github.com/h2so5/utp"
-	ma "github.com/jbenet/go-multiaddr"
+	utp "github.com/jbenet/go-multiaddr-net/Godeps/_workspace/src/github.com/h2so5/utp"
+	ma "github.com/jbenet/go-multiaddr-net/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 // Conn is the equivalent of a net.Conn object. It is the

net_test.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"testing"
 
-	ma "github.com/jbenet/go-multiaddr"
+	ma "github.com/jbenet/go-multiaddr-net/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 )
 
 func newMultiaddr(t *testing.T, m string) ma.Multiaddr {